From 903e1a305cb5942d9500cb3b3dabacd943e29090 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Wed, 30 Aug 2017 12:33:06 +0100 Subject: [PATCH] spinach test updates --- features/steps/group/milestones.rb | 4 +++- features/steps/project/active_tab.rb | 16 ++++++++-------- features/steps/project/fork.rb | 2 +- features/steps/project/issues/issues.rb | 2 +- features/steps/project/issues/milestones.rb | 4 +++- features/steps/project/merge_requests.rb | 2 +- features/steps/project/project_milestone.rb | 2 +- features/steps/project/redirects.rb | 2 +- features/steps/shared/project_tab.rb | 2 +- spec/features/merge_requests/diffs_spec.rb | 2 +- .../merge_requests/user_posts_diff_notes_spec.rb | 2 ++ 11 files changed, 23 insertions(+), 17 deletions(-) diff --git a/features/steps/group/milestones.rb b/features/steps/group/milestones.rb index f6559b6be2f..20edcf75ff1 100644 --- a/features/steps/group/milestones.rb +++ b/features/steps/group/milestones.rb @@ -47,7 +47,9 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps end step 'I click new milestone button' do - click_link "New milestone" + page.within('.breadcrumbs') do + click_link "New milestone" + end end step 'I press create mileston button' do diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb index 5cd9bd38c9d..4e0d85f6730 100644 --- a/features/steps/project/active_tab.rb +++ b/features/steps/project/active_tab.rb @@ -22,25 +22,25 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps end step 'I click the "Edit Project"' do - page.within '.sub-nav' do + page.within '.nav-sidebar' do click_link('Edit Project') end end step 'I click the "Integrations" tab' do - page.within '.sub-nav' do + page.within '.nav-sidebar' do click_link('Integrations') end end step 'I click the "Repository" tab' do - page.within '.sub-nav' do + page.within '.nav-sidebar' do click_link('Repository') end end step 'I click the "Activity" tab' do - page.within '.sub-nav' do + page.within '.nav-sidebar' do click_link('Activity') end end @@ -72,7 +72,7 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps end step 'I click the "Branches" tab' do - page.within '.sub-nav' do + page.within '.nav-sidebar' do click_link('Branches') end end @@ -82,7 +82,7 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps end step 'I click the "Charts" tab' do - page.within '.sub-nav' do + page.within '.nav-sidebar' do click_link('Charts') end end @@ -102,13 +102,13 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps # Sub Tabs: Issues step 'I click the "Milestones" sub tab' do - page.within('.sub-nav') do + page.within('.nav-sidebar') do click_link('Milestones') end end step 'I click the "Labels" sub tab' do - page.within('.sub-nav') do + page.within('.nav-sidebar') do click_link('Labels') end end diff --git a/features/steps/project/fork.rb b/features/steps/project/fork.rb index dd4dff7f7a9..3b8d9af96c1 100644 --- a/features/steps/project/fork.rb +++ b/features/steps/project/fork.rb @@ -36,7 +36,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps end step 'I goto the Merge Requests page' do - page.within '.layout-nav' do + page.within '.nav-sidebar' do click_link "Merge Requests" end end diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb index 2deef9036d3..43cdb4121c4 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -62,7 +62,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps end step 'I click link "New issue"' do - page.within '#content-body' do + page.within '.breadcrumbs' do page.has_link?('New Issue') ? click_link('New Issue') : click_link('New issue') end end diff --git a/features/steps/project/issues/milestones.rb b/features/steps/project/issues/milestones.rb index fe94eb03acd..307902a887e 100644 --- a/features/steps/project/issues/milestones.rb +++ b/features/steps/project/issues/milestones.rb @@ -16,7 +16,9 @@ class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps end step 'I click link "New Milestone"' do - click_link "New milestone" + page.within('.breadcrumbs') do + click_link "New milestone" + end end step 'I submit new milestone "v2.3"' do diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 7254fbc2e4e..3c3bffd7223 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -14,7 +14,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I click link "New Merge Request"' do - page.within '#content-body' do + page.within '.breadcrumbs' do page.has_link?('New Merge Request') ? click_link("New Merge Request") : click_link('New merge request') end end diff --git a/features/steps/project/project_milestone.rb b/features/steps/project/project_milestone.rb index a7d3352b8c4..b2d08515e77 100644 --- a/features/steps/project/project_milestone.rb +++ b/features/steps/project/project_milestone.rb @@ -55,7 +55,7 @@ class Spinach::Features::ProjectMilestone < Spinach::FeatureSteps end step 'I click link "Labels"' do - page.within('.layout-nav .nav-links') do + page.within('.nav-sidebar') do page.find(:xpath, "//a[@href='#tab-labels']").click end end diff --git a/features/steps/project/redirects.rb b/features/steps/project/redirects.rb index 53a2463af53..100e674abed 100644 --- a/features/steps/project/redirects.rb +++ b/features/steps/project/redirects.rb @@ -18,7 +18,7 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps step 'I should see project "Community" home page' do Gitlab.config.gitlab.should_receive(:host).and_return("www.example.com") - page.within '.navbar-gitlab .title' do + page.within '.breadcrumbs .title' do expect(page).to have_content 'Community' end end diff --git a/features/steps/shared/project_tab.rb b/features/steps/shared/project_tab.rb index 901f7f76ee9..97c6ad14885 100644 --- a/features/steps/shared/project_tab.rb +++ b/features/steps/shared/project_tab.rb @@ -53,7 +53,7 @@ module SharedProjectTab end step 'the active sub tab should be Home' do - ensure_active_sub_tab('Home') + ensure_active_sub_tab('Details') end step 'the active sub tab should be Activity' do diff --git a/spec/features/merge_requests/diffs_spec.rb b/spec/features/merge_requests/diffs_spec.rb index a8f5dc275e4..e9068f722d5 100644 --- a/spec/features/merge_requests/diffs_spec.rb +++ b/spec/features/merge_requests/diffs_spec.rb @@ -88,7 +88,7 @@ feature 'Diffs URL', js: true do visit diffs_project_merge_request_path(project, merge_request) # Throws `Capybara::Poltergeist::InvalidSelector` if we try to use `#hash` syntax - find("[id=\"#{changelog_id}\"] .js-edit-blob").click + find("[id=\"#{changelog_id}\"] .js-edit-blob").trigger('click') expect(page).to have_selector('.js-fork-suggestion-button', count: 1) expect(page).to have_selector('.js-cancel-fork-suggestion-button', count: 1) diff --git a/spec/features/merge_requests/user_posts_diff_notes_spec.rb b/spec/features/merge_requests/user_posts_diff_notes_spec.rb index f89dd38e5cd..162b9ccc1ff 100644 --- a/spec/features/merge_requests/user_posts_diff_notes_spec.rb +++ b/spec/features/merge_requests/user_posts_diff_notes_spec.rb @@ -17,6 +17,8 @@ feature 'Merge requests > User posts diff notes', :js do context 'when hovering over a parallel view diff file' do before do + allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true) + visit diffs_project_merge_request_path(project, merge_request, view: 'parallel') end