summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-06-13 18:24:51 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-06-13 18:37:30 -0400
commit422236c71eb8f1c88e83331b6eb74211fd7ccf49 (patch)
tree45066da8510fcd65d87eaa390261be94fb58c457 /spec/lib
parent75a40ad5bcee37f43fcfe89789dbd8c65be56c21 (diff)
downloadgitlab-ce-422236c71eb8f1c88e83331b6eb74211fd7ccf49.tar.gz
Change `foo.should` syntax to `expect(foo).to` in specs
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/ldap/access_spec.rb4
-rw-r--r--spec/lib/gitlab/o_auth/auth_hash_spec.rb14
2 files changed, 9 insertions, 9 deletions
diff --git a/spec/lib/gitlab/ldap/access_spec.rb b/spec/lib/gitlab/ldap/access_spec.rb
index fc346ea29d0..038ac7e0d75 100644
--- a/spec/lib/gitlab/ldap/access_spec.rb
+++ b/spec/lib/gitlab/ldap/access_spec.rb
@@ -23,7 +23,7 @@ describe Gitlab::LDAP::Access do
it "should block user in GitLab" do
access.allowed?
- user.should be_blocked
+ expect(user).to be_blocked
end
end
@@ -44,7 +44,7 @@ describe Gitlab::LDAP::Access do
it "does not unblock user in GitLab" do
access.allowed?
- user.should be_blocked
+ expect(user).to be_blocked
end
end
diff --git a/spec/lib/gitlab/o_auth/auth_hash_spec.rb b/spec/lib/gitlab/o_auth/auth_hash_spec.rb
index 678086ffa14..165cde4f160 100644
--- a/spec/lib/gitlab/o_auth/auth_hash_spec.rb
+++ b/spec/lib/gitlab/o_auth/auth_hash_spec.rb
@@ -80,31 +80,31 @@ describe Gitlab::OAuth::AuthHash do
context 'auth_hash constructed with ASCII-8BIT encoding' do
it 'forces utf8 encoding on uid' do
- auth_hash.uid.encoding.should eql Encoding::UTF_8
+ expect(auth_hash.uid.encoding).to eql Encoding::UTF_8
end
it 'forces utf8 encoding on provider' do
- auth_hash.provider.encoding.should eql Encoding::UTF_8
+ expect(auth_hash.provider.encoding).to eql Encoding::UTF_8
end
it 'forces utf8 encoding on name' do
- auth_hash.name.encoding.should eql Encoding::UTF_8
+ expect(auth_hash.name.encoding).to eql Encoding::UTF_8
end
it 'forces utf8 encoding on full_name' do
- auth_hash.full_name.encoding.should eql Encoding::UTF_8
+ expect(auth_hash.full_name.encoding).to eql Encoding::UTF_8
end
it 'forces utf8 encoding on username' do
- auth_hash.username.encoding.should eql Encoding::UTF_8
+ expect(auth_hash.username.encoding).to eql Encoding::UTF_8
end
it 'forces utf8 encoding on email' do
- auth_hash.email.encoding.should eql Encoding::UTF_8
+ expect(auth_hash.email.encoding).to eql Encoding::UTF_8
end
it 'forces utf8 encoding on password' do
- auth_hash.password.encoding.should eql Encoding::UTF_8
+ expect(auth_hash.password.encoding).to eql Encoding::UTF_8
end
end
end