diff options
Diffstat (limited to 'spec/lib/gitlab/auth/o_auth/user_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/auth/o_auth/user_spec.rb | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/spec/lib/gitlab/auth/o_auth/user_spec.rb b/spec/lib/gitlab/auth/o_auth/user_spec.rb index 7a8e6e77d52..8d36507ec7a 100644 --- a/spec/lib/gitlab/auth/o_auth/user_spec.rb +++ b/spec/lib/gitlab/auth/o_auth/user_spec.rb @@ -67,7 +67,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do create(:omniauth_user, extern_uid: 'my-uid', provider: provider) stub_omniauth_config(allow_single_sign_on: [provider], external_providers: [provider]) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user.external).to be_falsey @@ -83,7 +83,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do it 'creates the user' do stub_omniauth_config(allow_single_sign_on: [provider]) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_persisted end @@ -97,7 +97,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do it 'creates and confirms the user anyway' do stub_omniauth_config(allow_single_sign_on: [provider]) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_persisted expect(gl_user).to be_confirmed @@ -112,7 +112,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do it 'creates the user' do stub_omniauth_config(allow_single_sign_on: [provider]) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_persisted end @@ -121,7 +121,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do it 'marks user as having password_automatically_set' do stub_omniauth_config(allow_single_sign_on: [provider], external_providers: [provider]) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_persisted expect(gl_user).to be_password_automatically_set @@ -131,7 +131,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do context 'provider is marked as external' do it 'marks user as external' do stub_omniauth_config(allow_single_sign_on: [provider], external_providers: [provider]) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user.external).to be_truthy end @@ -141,7 +141,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do it 'does not mark external user as internal' do create(:omniauth_user, extern_uid: 'my-uid', provider: provider, external: true) stub_omniauth_config(allow_single_sign_on: [provider], external_providers: ['facebook']) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user.external).to be_truthy end @@ -151,9 +151,9 @@ RSpec.describe Gitlab::Auth::OAuth::User do context 'when adding a new OAuth identity' do it 'does not promote an external user to internal' do user = create(:user, email: 'john@mail.com', external: true) - user.identities.create(provider: provider, extern_uid: uid) + user.identities.create!(provider: provider, extern_uid: uid) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user.external).to be_truthy end @@ -166,7 +166,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it "creates a user from Omniauth" do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid identity = gl_user.identities.first @@ -181,7 +181,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it "creates a user from Omniauth" do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid identity = gl_user.identities.first @@ -196,7 +196,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it 'throws an error' do - expect { oauth_user.save }.to raise_error StandardError + expect { oauth_user.save }.to raise_error StandardError # rubocop:disable Rails/SaveBang end end @@ -206,7 +206,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it 'throws an error' do - expect { oauth_user.save }.to raise_error StandardError + expect { oauth_user.save }.to raise_error StandardError # rubocop:disable Rails/SaveBang end end end @@ -228,7 +228,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do let!(:existing_user) { create(:user, email: 'john@mail.com', username: 'john') } it "adds the OmniAuth identity to the GitLab user account" do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).not_to be_valid end @@ -248,7 +248,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do let!(:existing_user) { create(:user, email: 'john@mail.com', username: 'john') } it "adds the OmniAuth identity to the GitLab user account" do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user.username).to eql 'john' @@ -277,7 +277,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do let!(:existing_user) { create(:user, email: 'john@mail.com', username: 'john') } it "adds the OmniAuth identity to the GitLab user account" do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user.username).to eql 'john' @@ -337,7 +337,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do before do allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).and_return(ldap_user) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang end it "creates a user with dual LDAP and omniauth identities" do @@ -376,7 +376,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_email).with(uid, any_args).and_return(nil) allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_email).with(info_hash[:email], any_args).and_return(ldap_user) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang end it 'creates the LDAP identity' do @@ -392,7 +392,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do it "adds the omniauth identity to the LDAP account" do allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).and_return(ldap_user) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user.username).to eql 'john' @@ -414,7 +414,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).and_return(nil) allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_email).and_return(ldap_user) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang identities_as_hash = gl_user.identities.map { |id| { provider: id.provider, extern_uid: id.extern_uid } } expect(identities_as_hash).to match_array(result_identities(dn, uid)) @@ -426,7 +426,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_email).and_return(nil) allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_dn).and_return(ldap_user) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang identities_as_hash = gl_user.identities.map { |id| { provider: id.provider, extern_uid: id.extern_uid } } expect(identities_as_hash).to match_array(result_identities(dn, uid)) @@ -447,7 +447,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it 'does not save the identity' do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang identities_as_hash = gl_user.identities.map { |id| { provider: id.provider, extern_uid: id.extern_uid } } expect(identities_as_hash).to match_array([{ provider: 'twitter', extern_uid: uid }]) @@ -467,7 +467,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do it 'creates a user favoring the LDAP username and strips email domain' do allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).and_return(ldap_user) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user.username).to eql 'johndoe' @@ -510,7 +510,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do before do allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).and_return(ldap_user) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang end it "creates a user with dual LDAP and omniauth identities" do @@ -549,7 +549,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do it "adds the omniauth identity to the LDAP account" do allow(Gitlab::Auth::Ldap::Person).to receive(:find_by_uid).and_return(ldap_user) - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user.username).to eql 'john' @@ -584,7 +584,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user).not_to be_blocked end @@ -596,7 +596,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user).to be_blocked end @@ -622,7 +622,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user).not_to be_blocked end @@ -636,7 +636,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user).to be_blocked end @@ -654,7 +654,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user).not_to be_blocked end @@ -668,7 +668,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user).not_to be_blocked end @@ -678,7 +678,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do context 'sign-in' do before do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang oauth_user.gl_user.activate end @@ -688,7 +688,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user).not_to be_blocked end @@ -700,7 +700,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user).not_to be_blocked end @@ -714,7 +714,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user).not_to be_blocked end @@ -728,7 +728,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do end it do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang expect(gl_user).to be_valid expect(gl_user).not_to be_blocked end @@ -791,7 +791,7 @@ RSpec.describe Gitlab::Auth::OAuth::User do context 'when collision with existing user' do it 'generates the username with a counter' do - oauth_user.save + oauth_user.save # rubocop:disable Rails/SaveBang oauth_user2 = described_class.new(OmniAuth::AuthHash.new(uid: 'my-uid2', provider: provider, info: { nickname: 'johngitlab-ETC@othermail.com', email: 'john@othermail.com' })) expect(oauth_user2.gl_user.username).to eq('johngitlab-ETC1') |