fix: Execute PAM authentication tests on CircleCI (#9029)

and use 'if' option of context block
This commit is contained in:
takayamaki 2018-10-21 00:28:04 +09:00 committed by Eugen Rochko
parent fd5285658f
commit 33976c8ecc
2 changed files with 43 additions and 42 deletions

View file

@ -13,6 +13,9 @@ aliases:
ALLOW_NOPAM: true ALLOW_NOPAM: true
CONTINUOUS_INTEGRATION: true CONTINUOUS_INTEGRATION: true
DISABLE_SIMPLECOV: true DISABLE_SIMPLECOV: true
PAM_ENABLED: true
PAM_DEFAULT_SERVICE: pam_test
PAM_CONTROLLED_SERVICE: pam_test_controlled
working_directory: ~/projects/mastodon/ working_directory: ~/projects/mastodon/
- &attach_workspace - &attach_workspace

View file

@ -55,55 +55,53 @@ RSpec.describe Auth::SessionsController, type: :controller do
request.env['devise.mapping'] = Devise.mappings[:user] request.env['devise.mapping'] = Devise.mappings[:user]
end end
if ENV['PAM_ENABLED'] == 'true' context 'using PAM authentication', if: ENV['PAM_ENABLED'] == 'true' do
context 'using PAM authentication' do context 'using a valid password' do
context 'using a valid password' do before do
before do post :create, params: { user: { email: "pam_user1", password: '123456' } }
post :create, params: { user: { email: "pam_user1", password: '123456' } }
end
it 'redirects to home' do
expect(response).to redirect_to(root_path)
end
it 'logs the user in' do
expect(controller.current_user).to be_instance_of(User)
end
end end
context 'using an invalid password' do it 'redirects to home' do
before do expect(response).to redirect_to(root_path)
post :create, params: { user: { email: "pam_user1", password: 'WRONGPW' } }
end
it 'shows a login error' do
expect(flash[:alert]).to match I18n.t('devise.failure.invalid', authentication_keys: 'Email')
end
it "doesn't log the user in" do
expect(controller.current_user).to be_nil
end
end end
context 'using a valid email and existing user' do it 'logs the user in' do
let(:user) do expect(controller.current_user).to be_instance_of(User)
account = Fabricate.build(:account, username: 'pam_user1') end
account.save!(validate: false) end
user = Fabricate(:user, email: 'pam@example.com', password: nil, account: account)
user
end
before do context 'using an invalid password' do
post :create, params: { user: { email: user.email, password: '123456' } } before do
end post :create, params: { user: { email: "pam_user1", password: 'WRONGPW' } }
end
it 'redirects to home' do it 'shows a login error' do
expect(response).to redirect_to(root_path) expect(flash[:alert]).to match I18n.t('devise.failure.invalid', authentication_keys: 'Email')
end end
it 'logs the user in' do it "doesn't log the user in" do
expect(controller.current_user).to eq user expect(controller.current_user).to be_nil
end end
end
context 'using a valid email and existing user' do
let(:user) do
account = Fabricate.build(:account, username: 'pam_user1')
account.save!(validate: false)
user = Fabricate(:user, email: 'pam@example.com', password: nil, account: account)
user
end
before do
post :create, params: { user: { email: user.email, password: '123456' } }
end
it 'redirects to home' do
expect(response).to redirect_to(root_path)
end
it 'logs the user in' do
expect(controller.current_user).to eq user
end end
end end
end end