diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-10 18:09:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-10 18:09:23 +0300 |
commit | dd160c9146069788d76836f9515dba9fd7327a48 (patch) | |
tree | c14dbe07dff64d78b801b5f7aebe2493c4765109 /spec/lib/gitlab | |
parent | 5ba72f06f23f1ad1d0f428961caf020ccab1e2b2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r-- | spec/lib/gitlab/jira_import/base_importer_spec.rb | 1 | ||||
-rw-r--r-- | spec/lib/gitlab/jira_import/handle_labels_service_spec.rb | 1 | ||||
-rw-r--r-- | spec/lib/gitlab/jira_import_spec.rb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/spec/lib/gitlab/jira_import/base_importer_spec.rb b/spec/lib/gitlab/jira_import/base_importer_spec.rb index 1470bad2c4c..9d8143775f9 100644 --- a/spec/lib/gitlab/jira_import/base_importer_spec.rb +++ b/spec/lib/gitlab/jira_import/base_importer_spec.rb @@ -27,6 +27,7 @@ RSpec.describe Gitlab::JiraImport::BaseImporter do context 'when import data exists' do let_it_be(:project) { create(:project) } let_it_be(:jira_import) { create(:jira_import_state, project: project) } + let(:subject) { described_class.new(project) } context 'when #imported_items_cache_key is not implemented' do diff --git a/spec/lib/gitlab/jira_import/handle_labels_service_spec.rb b/spec/lib/gitlab/jira_import/handle_labels_service_spec.rb index 4e2c5afb077..b8c0dc64581 100644 --- a/spec/lib/gitlab/jira_import/handle_labels_service_spec.rb +++ b/spec/lib/gitlab/jira_import/handle_labels_service_spec.rb @@ -10,6 +10,7 @@ RSpec.describe Gitlab::JiraImport::HandleLabelsService do let_it_be(:project_label) { create(:label, project: project, title: 'bug') } let_it_be(:other_project_label) { create(:label, title: 'feature') } let_it_be(:group_label) { create(:group_label, group: group, title: 'dev') } + let(:jira_labels) { %w(bug feature dev group::new) } subject { described_class.new(project, jira_labels).execute } diff --git a/spec/lib/gitlab/jira_import_spec.rb b/spec/lib/gitlab/jira_import_spec.rb index 2b602c80640..94fdff984d5 100644 --- a/spec/lib/gitlab/jira_import_spec.rb +++ b/spec/lib/gitlab/jira_import_spec.rb @@ -9,6 +9,7 @@ RSpec.describe Gitlab::JiraImport do include JiraServiceHelper let_it_be(:project, reload: true) { create(:project) } + let(:additional_params) { {} } subject { described_class.validate_project_settings!(project, **additional_params) } |