Merge branch 'master' into sh-headless-chrome-support

9 files changed, 22 insertions, 18 deletions

diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index 5cd9bd38c9d..1a18f1d7065 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 '.sidebar-top-level-items > .active' do
       click_link('Repository')
     end
   end
 
   step 'I click the "Activity" tab' do
-    page.within '.sub-nav' do
+    page.within '.sidebar-top-level-items > .active' 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('.sidebar-top-level-items > .active') 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..f7dd4fc21e9 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
@@ -168,6 +168,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
            author: project.users.first,
            description: "# Description header"
           )
+    wait_for_requests
   end
 
   step 'project "Shop" have "Tweet control" open issue' do
diff --git a/features/steps/project/issues/milestones.rb b/features/steps/project/issues/milestones.rb
index d4345a4a432..4765bb7cebe 100644
--- a/features/steps/project/issues/milestones.rb
+++ b/features/steps/project/issues/milestones.rb
@@ -17,7 +17,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 9201639ac83..a57edc287be 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -15,7 +15,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/pages.rb b/features/steps/project/pages.rb
index bb69c0d6e99..124a132d688 100644
--- a/features/steps/project/pages.rb
+++ b/features/steps/project/pages.rb
@@ -23,13 +23,13 @@ class Spinach::Features::ProjectPages < Spinach::FeatureSteps
   end
 
   step 'I should see the "Pages" tab' do
-    page.within '.sub-nav' do
+    page.within '.nav-sidebar' do
       expect(page).to have_link('Pages')
     end
   end
 
   step 'I should not see the "Pages" tab' do
-    page.within '.sub-nav' do
+    page.within '.nav-sidebar' do
       expect(page).not_to have_link('Pages')
     end
   end
@@ -37,7 +37,8 @@ class Spinach::Features::ProjectPages < Spinach::FeatureSteps
   step 'pages are deployed' do
     pipeline = @project.pipelines.create(ref: 'HEAD',
                                          sha: @project.commit('HEAD').sha,
-                                         source: :push)
+                                         source: :push,
+                                         protected: false)
 
     build = build(:ci_build,
                   project: @project,
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/project/snippets.rb b/features/steps/project/snippets.rb
index d9bf373a0d7..0646a70acfd 100644
--- a/features/steps/project/snippets.rb
+++ b/features/steps/project/snippets.rb
@@ -23,7 +23,7 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
   end
 
   step 'I click link "New snippet"' do
-    page.within '#content-body' do
+    page.within '.breadcrumbs' do
       first(:link, "New snippet").click
     end
   end