Merge branch 'project-navigation-redesign' into 'master'

Project navigation redesign

Based on !3980. Part of #14838. This MR targets on desktop version. Mobile version improvements will be in separate merge request.

Part of #17522

cc @jschatz1 

See merge request !4053

2 files changed, 2 insertions, 5 deletions

diff --git a/spec/features/projects/badges/list_spec.rb b/spec/features/projects/badges/list_spec.rb
index 13c9b95b316..51be81d634c 100644
--- a/spec/features/projects/badges/list_spec.rb
+++ b/spec/features/projects/badges/list_spec.rb
@@ -8,12 +8,10 @@ feature 'list of badges' do
     project = create(:project)
     project.team << [user, :master]
     login_as(user)
-    visit edit_namespace_project_path(project.namespace, project)
+    visit namespace_project_badges_path(project.namespace, project)
   end
 
   scenario 'user displays list of badges' do
-    click_link 'Badges'
-
     expect(page).to have_content 'build status'
     expect(page).to have_content 'Markdown'
     expect(page).to have_content 'HTML'
@@ -26,7 +24,6 @@ feature 'list of badges' do
   end
 
   scenario 'user changes current ref on badges list page', js: true do
-    click_link 'Badges'
     select2('improve/awesome', from: '#ref')
 
     expect(page).to have_content 'badges/improve/awesome/build.svg'
diff --git a/spec/features/tags/master_updates_tag_spec.rb b/spec/features/tags/master_updates_tag_spec.rb
index c926e9841f3..6b5b3122f72 100644
--- a/spec/features/tags/master_updates_tag_spec.rb
+++ b/spec/features/tags/master_updates_tag_spec.rb
@@ -12,7 +12,7 @@ feature 'Master updates tag', feature: true do
 
   context 'from the tags list page' do
     scenario 'updates the release notes' do
-      page.within(first('.controls')) do
+      page.within(first('.content-list .controls')) do
         click_link 'Edit release notes'
       end