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/lib/gitlab/github_import/settings_spec.rb')
-rw-r--r--spec/lib/gitlab/github_import/settings_spec.rb11
1 files changed, 7 insertions, 4 deletions
diff --git a/spec/lib/gitlab/github_import/settings_spec.rb b/spec/lib/gitlab/github_import/settings_spec.rb
index d670aaea482..de497bc6689 100644
--- a/spec/lib/gitlab/github_import/settings_spec.rb
+++ b/spec/lib/gitlab/github_import/settings_spec.rb
@@ -62,17 +62,20 @@ RSpec.describe Gitlab::GithubImport::Settings, feature_category: :importers do
collaborators_import: false,
foo: :bar
},
+ timeout_strategy: "optimistic",
additional_access_tokens: %w[foo bar]
}.stringify_keys
end
- it 'puts optional steps & access tokens into projects import_data' do
- project.create_or_update_import_data(credentials: { user: 'token' })
+ it 'puts optional steps, timeout strategy & access tokens into projects import_data' do
+ project.build_or_assign_import_data(credentials: { user: 'token' })
settings.write(data_input)
expect(project.import_data.data['optional_stages'])
.to eq optional_stages.stringify_keys
+ expect(project.import_data.data['timeout_strategy'])
+ .to eq("optimistic")
expect(project.import_data.credentials.fetch(:additional_access_tokens))
.to eq(data_input['additional_access_tokens'])
end
@@ -80,7 +83,7 @@ RSpec.describe Gitlab::GithubImport::Settings, feature_category: :importers do
describe '#enabled?' do
it 'returns is enabled or not specific optional stage' do
- project.create_or_update_import_data(data: { optional_stages: optional_stages })
+ project.build_or_assign_import_data(data: { optional_stages: optional_stages })
expect(settings.enabled?(:single_endpoint_issue_events_import)).to eq true
expect(settings.enabled?(:single_endpoint_notes_import)).to eq false
@@ -91,7 +94,7 @@ RSpec.describe Gitlab::GithubImport::Settings, feature_category: :importers do
describe '#disabled?' do
it 'returns is disabled or not specific optional stage' do
- project.create_or_update_import_data(data: { optional_stages: optional_stages })
+ project.build_or_assign_import_data(data: { optional_stages: optional_stages })
expect(settings.disabled?(:single_endpoint_issue_events_import)).to eq false
expect(settings.disabled?(:single_endpoint_notes_import)).to eq true