Add latest changes from gitlab-org/gitlab@master

2 files changed, 36 insertions, 16 deletions

diff --git a/spec/features/commit_spec.rb b/spec/features/commit_spec.rb
index a9672569a4a..a3208ca6d37 100644
--- a/spec/features/commit_spec.rb
+++ b/spec/features/commit_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe 'Commit', feature_category: :source_code_management do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
 
-  describe "single commit view" do
+  shared_examples "single commit view" do
     let(:commit) do
       project.repository.commits(nil, limit: 100).find do |commit|
         commit.diffs.size > 1
@@ -69,4 +69,15 @@ RSpec.describe 'Commit', feature_category: :source_code_management do
       end
     end
   end
+
+  it_behaves_like "single commit view"
+
+  context "when super sidebar is enabled" do
+    before do
+      user.update!(use_new_navigation: true)
+      stub_feature_flags(super_sidebar_nav: true)
+    end
+
+    it_behaves_like "single commit view"
+  end
 end
diff --git a/spec/features/merge_requests/user_lists_merge_requests_spec.rb b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
index 3171ae89fe6..371c40b40a5 100644
--- a/spec/features/merge_requests/user_lists_merge_requests_spec.rb
+++ b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe 'Merge requests > User lists merge requests', feature_category: :
                   milestone: create(:milestone, project: project, due_date: '2013-12-11'),
                   created_at: 1.minute.ago,
                   updated_at: 1.minute.ago)
-    @fix.metrics.update!(merged_at: 10.seconds.ago, latest_closed_at: 10.seconds.ago)
+    @fix.metrics.update!(merged_at: 10.seconds.ago, latest_closed_at: 20.seconds.ago)
 
     @markdown = create(:merge_request,
            title: 'markdown',
@@ -33,7 +33,8 @@ RSpec.describe 'Merge requests > User lists merge requests', feature_category: :
            reviewers: [user, user2, user3, user4],
            milestone: create(:milestone, project: project, due_date: '2013-12-12'),
            created_at: 2.minutes.ago,
-           updated_at: 2.minutes.ago)
+           updated_at: 2.minutes.ago,
+           state: 'merged')
     @markdown.metrics.update!(merged_at: 10.minutes.ago, latest_closed_at: 10.seconds.ago)
 
     @merge_test = create(:merge_request,
@@ -49,7 +50,8 @@ RSpec.describe 'Merge requests > User lists merge requests', feature_category: :
            source_project: project,
            source_branch: 'feautre',
            created_at: 2.minutes.ago,
-           updated_at: 1.minute.ago)
+           updated_at: 1.minute.ago,
+           state: 'merged')
     @feature.metrics.update!(merged_at: 10.seconds.ago, latest_closed_at: 10.minutes.ago)
   end
 
@@ -79,10 +81,9 @@ RSpec.describe 'Merge requests > User lists merge requests', feature_category: :
 
     expect(page).to have_current_path(project_merge_requests_path(project), ignore_query: true)
     expect(page).to have_content 'merge-test'
-    expect(page).to have_content 'feature'
     expect(page).not_to have_content 'fix'
     expect(page).not_to have_content 'markdown'
-    expect(count_merge_requests).to eq(2)
+    expect(count_merge_requests).to eq(1)
   end
 
   it 'filters on a specific assignee' do
@@ -90,8 +91,7 @@ RSpec.describe 'Merge requests > User lists merge requests', feature_category: :
 
     expect(page).not_to have_content 'merge-test'
     expect(page).to have_content 'fix'
-    expect(page).to have_content 'markdown'
-    expect(count_merge_requests).to eq(2)
+    expect(count_merge_requests).to eq(1)
   end
 
   it 'sorts by newest' do
@@ -99,35 +99,35 @@ RSpec.describe 'Merge requests > User lists merge requests', feature_category: :
 
     expect(first_merge_request).to include('fix')
     expect(last_merge_request).to include('merge-test')
-    expect(count_merge_requests).to eq(4)
+    expect(count_merge_requests).to eq(2)
   end
 
   it 'sorts by last updated' do
     visit_merge_requests(project, sort: sort_value_recently_updated)
 
     expect(first_merge_request).to include('merge-test')
-    expect(count_merge_requests).to eq(4)
+    expect(count_merge_requests).to eq(2)
   end
 
   it 'sorts by milestone due date' do
     visit_merge_requests(project, sort: sort_value_milestone)
 
     expect(first_merge_request).to include('fix')
-    expect(count_merge_requests).to eq(4)
+    expect(count_merge_requests).to eq(2)
   end
 
-  it 'sorts by merged at' do
+  it 'ignores sorting by merged at' do
     visit_merge_requests(project, sort: sort_value_merged_date)
 
-    expect(first_merge_request).to include('markdown')
-    expect(count_merge_requests).to eq(4)
+    expect(first_merge_request).to include('fix')
+    expect(count_merge_requests).to eq(2)
   end
 
   it 'sorts by closed at' do
     visit_merge_requests(project, sort: sort_value_closed_date)
 
-    expect(first_merge_request).to include('feature')
-    expect(count_merge_requests).to eq(4)
+    expect(first_merge_request).to include('fix')
+    expect(count_merge_requests).to eq(2)
   end
 
   it 'filters on one label and sorts by milestone due date' do
@@ -141,6 +141,15 @@ RSpec.describe 'Merge requests > User lists merge requests', feature_category: :
     expect(count_merge_requests).to eq(1)
   end
 
+  context 'when viewing merged merge requests' do
+    it 'sorts by merged at' do
+      visit_merge_requests(project, state: 'merged', sort: sort_value_merged_date)
+
+      expect(first_merge_request).to include('markdown')
+      expect(count_merge_requests).to eq(2)
+    end
+  end
+
   context 'while filtering on two labels' do
     let(:label) { create(:label, project: project) }
     let(:label2) { create(:label, project: project) }