Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/controllers/projects/merge_requests/diffs_controller_spec.rb')
-rw-r--r--spec/controllers/projects/merge_requests/diffs_controller_spec.rb20
1 files changed, 19 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
index 9905b6ba512..b2b591d7929 100644
--- a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
@@ -625,7 +625,7 @@ RSpec.describe Projects::MergeRequests::DiffsController, feature_category: :code
end
context 'when ck param is present' do
- let(:cache_key) { merge_request.merge_head_diff.id }
+ let(:cache_key) { 'abc123' }
before do
create(:merge_request_diff, :merge_head, merge_request: merge_request)
@@ -657,5 +657,23 @@ RSpec.describe Projects::MergeRequests::DiffsController, feature_category: :code
end
end
end
+
+ context 'when collapse_generated_diff_files FF is enabled' do
+ it 'sets generated' do
+ go
+ expect(json_response["diff_files"][0]["viewer"]["generated"]).to eq(false)
+ end
+ end
+
+ context 'when collapse_generated_diff_files FF is disabled' do
+ before do
+ stub_feature_flags(collapse_generated_diff_files: false)
+ end
+
+ it 'sets generated as nil' do
+ go
+ expect(json_response["diff_files"][0]["viewer"]["generated"]).to be_nil
+ end
+ end
end
end