Add latest changes from gitlab-org/gitlab@master

4 files changed, 74 insertions, 25 deletions

diff --git a/spec/features/milestones/user_views_milestone_spec.rb b/spec/features/milestones/user_views_milestone_spec.rb
index 420f8d49483..11c6fa521d5 100644
--- a/spec/features/milestones/user_views_milestone_spec.rb
+++ b/spec/features/milestones/user_views_milestone_spec.rb
@@ -4,12 +4,16 @@ require 'spec_helper'
 
 RSpec.describe "User views milestone" do
   let_it_be(:user) { create(:user) }
-  let_it_be(:project) { create(:project) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:project, :repository, group: group) }
   let_it_be(:milestone) { create(:milestone, project: project) }
   let_it_be(:labels) { create_list(:label, 2, project: project) }
 
-  before do
+  before_all do
     project.add_developer(user)
+  end
+
+  before do
     sign_in(user)
   end
 
@@ -25,7 +29,7 @@ RSpec.describe "User views milestone" do
     expect { visit_milestone }.not_to exceed_query_limit(control)
   end
 
-  context 'limiting milestone issues' do
+  context 'issues list', :js do
     before_all do
       2.times do
         create(:issue, milestone: milestone, project: project)
@@ -34,6 +38,28 @@ RSpec.describe "User views milestone" do
       end
     end
 
+    context 'for a project milestone' do
+      it 'does not show the project name' do
+        visit(project_milestone_path(project, milestone))
+
+        wait_for_requests
+
+        expect(page.find('#tab-issues')).not_to have_text(project.name)
+      end
+    end
+
+    context 'for a group milestone' do
+      let(:group_milestone) { create(:milestone, group: group) }
+
+      it 'shows the project name' do
+        create(:issue, project: project, milestone: group_milestone)
+
+        visit(group_milestone_path(group, group_milestone))
+
+        expect(page.find('#tab-issues')).to have_text(project.name)
+      end
+    end
+
     context 'when issues on milestone are over DISPLAY_ISSUES_LIMIT' do
       it "limits issues to display and shows warning" do
         stub_const('Milestoneish::DISPLAY_ISSUES_LIMIT', 3)
@@ -56,6 +82,40 @@ RSpec.describe "User views milestone" do
     end
   end
 
+  context 'merge requests list', :js do
+    context 'for a project milestone' do
+      it 'does not show the project name' do
+        create(:merge_request, source_project: project, milestone: milestone)
+
+        visit(project_milestone_path(project, milestone))
+
+        within('.js-milestone-tabs') do
+          click_link('Merge Requests')
+        end
+
+        wait_for_requests
+
+        expect(page.find('#tab-merge-requests')).not_to have_text(project.name)
+      end
+    end
+
+    context 'for a group milestone' do
+      let(:group_milestone) { create(:milestone, group: group) }
+
+      it 'shows the project name' do
+        create(:merge_request, source_project: project, milestone: group_milestone)
+
+        visit(group_milestone_path(group, group_milestone))
+
+        within('.js-milestone-tabs') do
+          click_link('Merge Requests')
+        end
+
+        expect(page.find('#tab-merge-requests')).to have_text(project.name)
+      end
+    end
+  end
+
   private
 
   def visit_milestone
diff --git a/spec/features/milestones/user_views_milestones_spec.rb b/spec/features/milestones/user_views_milestones_spec.rb
index 3f606577121..f8b4b802a60 100644
--- a/spec/features/milestones/user_views_milestones_spec.rb
+++ b/spec/features/milestones/user_views_milestones_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe "User views milestones" do
       .and have_content("Merge Requests")
   end
 
-  context "with issues" do
+  context "with issues", :js do
     let_it_be(:issue) { create(:issue, project: project, milestone: milestone) }
     let_it_be(:closed_issue) { create(:closed_issue, project: project, milestone: milestone) }
 
@@ -33,7 +33,6 @@ RSpec.describe "User views milestones" do
         .and have_selector("#tab-issues li.issuable-row", count: 2)
         .and have_content(issue.title)
         .and have_content(closed_issue.title)
-        .and have_selector("#tab-merge-requests")
     end
   end
 
diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb
index 7f2ef61bcbe..8c032660726 100644
--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
@@ -372,7 +372,7 @@ RSpec.describe 'Environments page', :js do
       let(:role) { :developer }
 
       it 'developer creates a new environment with a valid name' do
-        within(".top-area") { click_link 'New environment' }
+        within(".environments-section") { click_link 'New environment' }
         fill_in('Name', with: 'production')
         click_on 'Save'
 
@@ -380,7 +380,7 @@ RSpec.describe 'Environments page', :js do
       end
 
       it 'developer creates a new environmetn with invalid name' do
-        within(".top-area") { click_link 'New environment' }
+        within(".environments-section") { click_link 'New environment' }
         fill_in('Name', with: 'name,with,commas')
         click_on 'Save'
 
diff --git a/spec/features/search/user_uses_header_search_field_spec.rb b/spec/features/search/user_uses_header_search_field_spec.rb
index cfda25b9ab4..5cbfacf4e48 100644
--- a/spec/features/search/user_uses_header_search_field_spec.rb
+++ b/spec/features/search/user_uses_header_search_field_spec.rb
@@ -30,6 +30,8 @@ RSpec.describe 'User uses header search field', :js do
       before do
         find('#search')
         find('body').native.send_keys('s')
+
+        wait_for_all_requests
       end
 
       it 'shows the category search dropdown' do
@@ -89,9 +91,7 @@ RSpec.describe 'User uses header search field', :js do
 
     context 'when entering text into the search field' do
       it 'does not display the category search dropdown' do
-        page.within('.search-input-wrap') do
-          fill_in('search', with: scope_name.first(4))
-        end
+        fill_in_search(scope_name.first(4))
 
         expect(page).not_to have_selector('.dropdown-header', text: /#{scope_name}/i)
       end
@@ -105,9 +105,7 @@ RSpec.describe 'User uses header search field', :js do
     end
 
     it 'displays search options' do
-      page.within('.search-input-wrap') do
-        fill_in('search', with: 'test')
-      end
+      fill_in_search('test')
 
       expect(page).to have_selector(scoped_search_link('test'))
     end
@@ -140,9 +138,7 @@ RSpec.describe 'User uses header search field', :js do
       end
 
       it 'displays search options' do
-        page.within('.search-input-wrap') do
-          fill_in('search', with: 'test')
-        end
+        fill_in_search('test')
 
         expect(page).to have_selector(scoped_search_link('test'))
         expect(page).to have_selector(scoped_search_link('test', group_id: group.id))
@@ -157,9 +153,7 @@ RSpec.describe 'User uses header search field', :js do
       end
 
       it 'displays search options' do
-        page.within('.search-input-wrap') do
-          fill_in('search', with: 'test')
-        end
+        fill_in_search('test')
 
         expect(page).to have_selector(scoped_search_link('test'))
         expect(page).not_to have_selector(scoped_search_link('test', group_id: project.namespace_id))
@@ -182,9 +176,7 @@ RSpec.describe 'User uses header search field', :js do
     end
 
     it 'displays search options' do
-      page.within('.search-input-wrap') do
-        fill_in('search', with: 'test')
-      end
+      fill_in_search('test')
 
       expect(page).to have_selector(scoped_search_link('test'))
       expect(page).to have_selector(scoped_search_link('test', group_id: group.id))
@@ -208,9 +200,7 @@ RSpec.describe 'User uses header search field', :js do
     end
 
     it 'displays search options' do
-      page.within('.search-input-wrap') do
-        fill_in('search', with: 'test')
-      end
+      fill_in_search('test')
 
       expect(page).to have_selector(scoped_search_link('test'))
       expect(page).to have_selector(scoped_search_link('test', group_id: subgroup.id))