Add latest changes from gitlab-org/gitlab@master

5 files changed, 25 insertions, 4 deletions

diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb
index f30689240c5..d05709b7e2f 100644
--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -217,7 +217,7 @@ describe 'Issue Boards', :js do
 
         wait_for_requests
 
-        click_link "No Milestone"
+        click_link "No milestone"
 
         wait_for_requests
 
diff --git a/spec/features/groups/issues_spec.rb b/spec/features/groups/issues_spec.rb
index e03d7b6d1f7..a9df2a64df4 100644
--- a/spec/features/groups/issues_spec.rb
+++ b/spec/features/groups/issues_spec.rb
@@ -186,4 +186,25 @@ describe 'Group issues page' do
       end
     end
   end
+
+  context 'issues pagination' do
+    let(:user_in_group) { create(:group_member, :maintainer, user: create(:user), group: group ).user }
+
+    let!(:issues) do
+      (1..25).to_a.map { |index| create(:issue, project: project, title: "Issue #{index}") }
+    end
+
+    before do
+      sign_in(user_in_group)
+      visit issues_group_path(group)
+    end
+
+    it 'shows the pagination' do
+      expect(page).to have_selector('.gl-pagination')
+    end
+
+    it 'first pagination item is active' do
+      expect(page).to have_css(".js-first-button a.page-link.active")
+    end
+  end
 end
diff --git a/spec/features/issues/bulk_assignment_labels_spec.rb b/spec/features/issues/bulk_assignment_labels_spec.rb
index d036fde5657..fc9176715c3 100644
--- a/spec/features/issues/bulk_assignment_labels_spec.rb
+++ b/spec/features/issues/bulk_assignment_labels_spec.rb
@@ -274,7 +274,7 @@ describe 'Issues > Labels bulk assignment' do
           expect(find("#issue_#{issue2.id}")).to have_content 'First Release'
 
           check 'check-all-issues'
-          open_milestone_dropdown(['No Milestone'])
+          open_milestone_dropdown(['No milestone'])
           update_issues
 
           expect(find("#issue_#{issue1.id}")).to have_content 'bug'
diff --git a/spec/features/issues/update_issues_spec.rb b/spec/features/issues/update_issues_spec.rb
index 45a0b1932a2..98f70df1c8b 100644
--- a/spec/features/issues/update_issues_spec.rb
+++ b/spec/features/issues/update_issues_spec.rb
@@ -95,7 +95,7 @@ describe 'Multiple issue updating from issues#index', :js do
       find('#check-all-issues').click
       find('.issues-bulk-update .js-milestone-select').click
 
-      find('.dropdown-menu-milestone a', text: "No Milestone").click
+      find('.dropdown-menu-milestone a', text: "No milestone").click
       click_update_issues_button
 
       expect(find('.issue:first-child')).not_to have_content milestone.title
diff --git a/spec/features/merge_requests/user_mass_updates_spec.rb b/spec/features/merge_requests/user_mass_updates_spec.rb
index 4d3461bf1ae..fa951dd50d3 100644
--- a/spec/features/merge_requests/user_mass_updates_spec.rb
+++ b/spec/features/merge_requests/user_mass_updates_spec.rb
@@ -91,7 +91,7 @@ describe 'Merge requests > User mass updates', :js do
       end
 
       it 'removes milestone from the merge request' do
-        change_milestone("No Milestone")
+        change_milestone("No milestone")
 
         expect(find('.merge-request')).not_to have_content milestone.title
       end