diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-19 10:42:55 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-02-19 10:42:55 +0100 |
| commit | 7452a959989f1259b68d08814437bab53ee89bb0 (patch) | |
| tree | 389c2be7b7a326729e4687019a58950a07bd2dde /spec/features/log_in_spec.rb | |
| parent | 4c68189d2b8b6a9a74fc13862b11bf6c6d523409 (diff) | |
| parent | fef6c59b3abe349132dbe910b6aa243e59b732bb (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.
Diffstat (limited to 'spec/features/log_in_spec.rb')
| -rw-r--r-- | spec/features/log_in_spec.rb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/spec/features/log_in_spec.rb b/spec/features/log_in_spec.rb index de1a6de03..5ae738ee2 100644 --- a/spec/features/log_in_spec.rb +++ b/spec/features/log_in_spec.rb @@ -2,21 +2,21 @@ require 'rails_helper' -feature 'Log in' do +describe 'Log in' do include ProfileStories - given(:email) { "test@example.com" } - given(:password) { "password" } - given(:confirmed_at) { Time.zone.now } + subject { page } + + let(:email) { 'test@example.com' } + let(:password) { 'password' } + let(:confirmed_at) { Time.zone.now } - background do + before do as_a_registered_user visit new_user_session_path end - subject { page } - - scenario 'A valid email and password user is able to log in' do + it 'A valid email and password user is able to log in' do fill_in 'user_email', with: email fill_in 'user_password', with: password click_on I18n.t('auth.login') @@ -24,7 +24,7 @@ feature 'Log in' do is_expected.to have_css('div.app-holder') end - scenario 'A invalid email and password user is not able to log in' do + it 'A invalid email and password user is not able to log in' do fill_in 'user_email', with: 'invalid_email' fill_in 'user_password', with: 'invalid_password' click_on I18n.t('auth.login') @@ -33,9 +33,9 @@ feature 'Log in' do end context do - given(:confirmed_at) { nil } + let(:confirmed_at) { nil } - scenario 'A unconfirmed user is able to log in' do + it 'A unconfirmed user is able to log in' do fill_in 'user_email', with: email fill_in 'user_password', with: password click_on I18n.t('auth.login') |