diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-14 13:46:22 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-14 13:46:22 +0300 |
commit | 5c6d83b8e772dedb753336d83783123e166fbe40 (patch) | |
tree | 7e633d679815138955e8b5ba045137592eb2c872 /spec/lib | |
parent | b645f0f432f6838a38b358b3e30e94c19759be02 (diff) | |
parent | 26f612505c76a0b37f33e278acfc6a9ab65a323d (diff) |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/ldap/access_spec.rb | 6 | ||||
-rw-r--r-- | spec/lib/gitlab/o_auth/auth_hash_spec.rb | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/spec/lib/gitlab/ldap/access_spec.rb b/spec/lib/gitlab/ldap/access_spec.rb index 2189e313d6a..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 @@ -56,7 +56,7 @@ describe Gitlab::LDAP::Access do it "should unblock user in GitLab" do access.allowed? - user.should_not be_blocked + expect(user).not_to be_blocked end 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 |