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:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-30 18:09:38 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-30 18:09:38 +0300
commitaad78b57896307fff73539719d510a8c82be77f9 (patch)
tree22cf373de6921743c23dd694945f0a349880b4a2 /spec/helpers
parent96e4317f73c749841cc1d808b788d43aa3407a4a (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/helpers')
-rw-r--r--spec/helpers/ci/pipeline_editor_helper_spec.rb4
-rw-r--r--spec/helpers/registrations_helper_spec.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/helpers/ci/pipeline_editor_helper_spec.rb b/spec/helpers/ci/pipeline_editor_helper_spec.rb
index b45882d9888..f411f533b25 100644
--- a/spec/helpers/ci/pipeline_editor_helper_spec.rb
+++ b/spec/helpers/ci/pipeline_editor_helper_spec.rb
@@ -73,7 +73,7 @@ RSpec.describe Ci::PipelineEditorHelper do
context 'with a project with commits' do
it 'returns pipeline editor data' do
- expect(pipeline_editor_data).to eq(default_helper_data.merge({
+ expect(pipeline_editor_data).to include(default_helper_data.merge({
"pipeline_etag" => graphql_etag_pipeline_sha_path(project.commit.sha),
"total-branches" => project.repository.branches.length
}))
@@ -84,7 +84,7 @@ RSpec.describe Ci::PipelineEditorHelper do
let(:project) { create(:project, :empty_repo) }
it 'returns pipeline editor data' do
- expect(pipeline_editor_data).to eq(default_helper_data.merge({
+ expect(pipeline_editor_data).to include(default_helper_data.merge({
"pipeline_etag" => '',
"total-branches" => 0
}))
diff --git a/spec/helpers/registrations_helper_spec.rb b/spec/helpers/registrations_helper_spec.rb
index a5ad80abd11..85cedd4aace 100644
--- a/spec/helpers/registrations_helper_spec.rb
+++ b/spec/helpers/registrations_helper_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe RegistrationsHelper, feature_category: :user_management do
it 'adds intent to register' do
allow(helper).to receive(:glm_tracking_params).and_return({})
- expect(helper.register_omniauth_params({})).to eq({ intent: :register })
+ expect(helper.register_omniauth_params({})).to eq({})
end
end
end