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/helpers/commits_helper_spec.rb')
-rw-r--r--spec/helpers/commits_helper_spec.rb16
1 files changed, 3 insertions, 13 deletions
diff --git a/spec/helpers/commits_helper_spec.rb b/spec/helpers/commits_helper_spec.rb
index 9a1ecb22edb..4e94636ba45 100644
--- a/spec/helpers/commits_helper_spec.rb
+++ b/spec/helpers/commits_helper_spec.rb
@@ -205,16 +205,6 @@ RSpec.describe CommitsHelper do
{ id: forked_project.id.to_s, name: forked_project.full_path, refsUrl: refs_project_path(forked_project) }
])
end
-
- context 'pick_into_project is disabled' do
- before do
- stub_feature_flags(pick_into_project: false)
- end
-
- it 'does not calculate target projects' do
- expect(helper.cherry_pick_projects_data(project)).to eq([])
- end
- end
end
describe "#commit_options_dropdown_data" do
@@ -298,7 +288,7 @@ RSpec.describe CommitsHelper do
let(:pipeline) { create(:ci_pipeline, :running) }
let(:user) { create(:user) }
let(:ref) { "master" }
- let(:merge_request) { nil }
+ let(:merge_request) { create(:merge_request) }
let(:request) { double(xhr?: true) }
let(:current_path) { "test" }
@@ -315,8 +305,8 @@ RSpec.describe CommitsHelper do
it do
is_expected.to include(
{
- merge_request: merge_request,
- pipeline_status: commit_status,
+ merge_request: merge_request.cache_key,
+ pipeline_status: pipeline.cache_key,
xhr: true,
controller: "commits",
path: current_path