Fix brittle tests

Author: bshand

test/integration/project_core_test.rb

@@ -11,29 +11,23 @@ def setup
   end
 
   test 'sign in and visit project page, standard user' do
-    sign_in @user
-    visit terms_and_conditions_path
-    click_on 'Accept'
+    login_and_accept_terms(@user)
     visit projects_path
     assert page.has_content?('Notifications')
     visit terms_and_conditions_path
     assert page.has_content?('Terms and Conditions have been accepted')
   end
 
   test 'sign in and visit project page, odr user' do
-    sign_in @odr
-    visit terms_and_conditions_path
-    click_on 'Accept'
+    login_and_accept_terms(@odr)
     visit projects_path
     assert page.has_content?('Notifications')
     visit terms_and_conditions_path
     assert page.has_content?('Terms and Conditions have been accepted')
   end
 
   test 'sign in and visit project page, admin user' do
-    sign_in @admin
-    visit terms_and_conditions_path
-    click_on 'Accept'
+    login_and_accept_terms(@admin)
     visit projects_path
     assert page.has_content?('Notifications')
     visit terms_and_conditions_path
@@ -43,19 +37,17 @@ def setup
   test 'reset project approvals' do
     project = projects(:pending_project)
 
-    sign_in @odr
-    visit terms_and_conditions_path
-    click_on 'Accept'
+    login_and_accept_terms(@odr)
     visit project_path(project)
     click_link('Project Details')
 
     assert_changes -> { project.reload.details_approved } do
       within('#approve_details_status') do
         click_button 'Approve'
 
-        assert has_no_button? 'Approve'
-        assert has_text? 'APPROVED'
       end
+      assert_text 'APPROVED'
+      assert has_no_button? 'Approve'
     end
 
     accept_prompt do
@@ -68,30 +60,23 @@ def setup
 
 =begin
   test 'soft delete a project' do
-    sign_in @admin
-    visit terms_and_conditions_path
-    click_on 'Accept'
+    login_and_accept_terms(@admin)
     visit project_path(projects(:new_project))
     click_on 'Delete'
     assert page.has_content?('Project was successfully destroyed.')
   end
 =end
 
   test 'should error if no permission to show project' do
-    sign_in users(:standard_user_multiple_teams)
-    visit terms_and_conditions_path
-    click_on 'Accept'
+    login_and_accept_terms(users(:standard_user_multiple_teams))
     @project = projects(:approved_project)
     visit project_path(@project)
   end
 
   test 'successful project allocation' do
     assigned_user = users(:application_manager_two)
 
-    sign_in @odr
-
-    visit terms_and_conditions_path
-    click_on 'Accept'
+    login_and_accept_terms(@odr)
 
     visit project_path(@eoi)
 
@@ -102,12 +87,12 @@ def setup
             select 'Application Manager Two', from: 'Application Manager'
             click_button 'Apply'
           end
+          assert_text 'EOI was successfully assigned'
         end
       end
     end
 
     assert_current_path project_path(@eoi)
-    assert page.has_text? 'EOI was successfully assigned'
     assert_equal assigned_user, @eoi.reload.assigned_user
 
     open_email assigned_user.email
@@ -118,10 +103,7 @@ def setup
   test 'unsuccessful project allocation' do
     Project.any_instance.stubs(save: false)
 
-    sign_in @odr
-
-    visit terms_and_conditions_path
-    click_on 'Accept'
+    login_and_accept_terms(@odr)
 
     visit project_path(@eoi)
 
@@ -144,10 +126,7 @@ def setup
 
     project = projects(:pending_delegate_project)
 
-    sign_in users(:delegate_user1)
-
-    visit terms_and_conditions_path
-    click_link 'Accept'
+    login_and_accept_terms(users(:delegate_user1))
     visit project_path(project)
 
     accept_prompt do
@@ -158,10 +137,7 @@ def setup
   end
 
   test 'should get dashboard page' do
-    sign_in @odr
-
-    visit terms_and_conditions_path
-    click_on 'Accept'
+    login_and_accept_terms(@odr)
 
     within '.navbar' do
       assert_nothing_raised do
@@ -181,7 +157,7 @@ def setup
     project.update!(parent: parent, owner: @user)
     child.update!(parent: project, owner: @user)
 
-    sign_in @user
+    login_and_accept_terms(@user)
 
     visit project_path(project)
 

test/integration/project_dashboard_test.rb

@@ -6,15 +6,13 @@ def setup
   end
 
   test 'sign in and visit project page, application manager' do
-    sign_in users(:application_manager_three)
     cas_project = create_project(project_type: project_types(:cas),
                                  owner: users(:application_manager_three))
     cas_project2 = create_project(project_type: project_types(:cas),
                                   owner: users(:standard_user))
     eoi_project = create_project(project_type: project_types(:eoi), project_purpose: 'test',
                                  owner: users(:application_manager_three))
-    visit terms_and_conditions_path
-    click_on 'Accept'
+    login_and_accept_terms(users(:application_manager_three))
     visit dashboard_projects_path
     within('#projects-table', match: :first) do
       assert has_content?('Project Title')
@@ -48,15 +46,14 @@ def setup
   end
 
   test 'sign in and visit project page, mbis delegate' do
-    sign_in users(:delegate_user1)
+
     cas_project = create_project(project_type: project_types(:cas),
                                  owner: users(:delegate_user1))
     cas_project2 = create_project(project_type: project_types(:cas),
                                   owner: users(:standard_user))
     mbis_project = create_project(project_type: project_types(:project), project_purpose: 'test',
                                   owner: users(:delegate_user1))
-    visit terms_and_conditions_path
-    click_on 'Accept'
+    login_and_accept_terms(users(:delegate_user1))
     visit dashboard_projects_path
 
     assert has_content?('Unassigned Projects')
@@ -88,15 +85,13 @@ def setup
   end
 
   test 'sign in and visit project page, mbis applicant' do
-    sign_in users(:standard_user1)
     cas_project = create_project(project_type: project_types(:cas),
                                  owner: users(:standard_user1))
     cas_project2 = create_project(project_type: project_types(:cas),
                                   owner: users(:no_roles))
     mbis_project = create_project(project_type: project_types(:project), project_purpose: 'test',
                                   owner: users(:standard_user1))
-    visit terms_and_conditions_path
-    click_on 'Accept'
+    login_and_accept_terms(users(:standard_user1))
     visit dashboard_projects_path
 
     assert has_content?('Unassigned Projects')

test/integration/smoke_test.rb

@@ -10,6 +10,7 @@ def setup
   test 'sign in and accept terms' do
     sign_in @user
     visit terms_and_conditions_path
+    assert_text @user.email
     click_on 'Accept'
     assert page.has_content?('Notifications')
     visit terms_and_conditions_path
@@ -19,6 +20,7 @@ def setup
   test 'sign in and reject terms' do
     sign_in @user
     visit terms_and_conditions_path
+    assert_text @user.email
     click_on 'Reject'
     assert page.has_content?('You have 2 attempts to approve the terms and then your account will be locked')
     assert page.has_content?('Welcome to the Data Management System')

test/integration/team_core_test.rb

@@ -5,9 +5,7 @@ def setup
     @admin        = users(:admin_user)
     @organisation = organisations(:test_organisation_one)
 
-    sign_in @admin
-    visit terms_and_conditions_path
-    click_on 'Accept'
+    login_and_accept_terms(@admin)
     visit organisation_teams_path(@organisation)
   end