Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 11 deletions

diff --git a/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb b/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb
index 031dc729a79..8c72430ff5c 100644
--- a/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb
+++ b/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb
@@ -8,6 +8,7 @@ RSpec.describe MergeRequestPollCachedWidgetEntity do
   let_it_be(:project, refind: true)  { create :project, :repository }
   let_it_be(:resource, refind: true) { create(:merge_request, source_project: project, target_project: project) }
   let_it_be(:user)     { create(:user) }
+  let(:pipeline) { create(:ci_empty_pipeline, project: project) }
 
   let(:request) { double('request', current_user: user, project: project) }
 
@@ -25,6 +26,17 @@ RSpec.describe MergeRequestPollCachedWidgetEntity do
     expect(subject[:merge_status]).to eq 'checking'
   end
 
+  it 'has blob path data' do
+    allow(resource).to receive_messages(
+      base_pipeline: pipeline,
+      head_pipeline: pipeline
+    )
+
+    expect(subject).to include(:blob_path)
+    expect(subject[:blob_path]).to include(:base_path)
+    expect(subject[:blob_path]).to include(:head_path)
+  end
+
   describe 'diverged_commits_count' do
     context 'when MR open and its diverging' do
       it 'returns diverged commits count' do
diff --git a/spec/serializers/merge_request_widget_entity_spec.rb b/spec/serializers/merge_request_widget_entity_spec.rb
index 9f734c08ef4..42d843af596 100644
--- a/spec/serializers/merge_request_widget_entity_spec.rb
+++ b/spec/serializers/merge_request_widget_entity_spec.rb
@@ -76,17 +76,6 @@ RSpec.describe MergeRequestWidgetEntity do
       .to eq("/#{resource.project.full_path}/-/merge_requests/#{resource.iid}.diff")
   end
 
-  it 'has blob path data' do
-    allow(resource).to receive_messages(
-      base_pipeline: pipeline,
-      head_pipeline: pipeline
-    )
-
-    expect(subject).to include(:blob_path)
-    expect(subject[:blob_path]).to include(:base_path)
-    expect(subject[:blob_path]).to include(:head_path)
-  end
-
   describe 'codequality report artifacts', :request_store do
     let(:merge_base_pipeline) { create(:ci_pipeline, :with_codequality_report, project: project) }