diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-26 15:08:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-26 15:08:22 +0300 |
commit | 1691cbe307f7698b3ee39811278990c43b6751a5 (patch) | |
tree | 2bd7d5b7143242f540a9edde92c83c791ebf8af4 /spec/lib | |
parent | 27c6c4bf061c3a2289ce4808b1b354535994d09d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/jira_import/base_importer_spec.rb | 14 | ||||
-rw-r--r-- | spec/lib/gitlab/jira_import/issues_importer_spec.rb | 1 | ||||
-rw-r--r-- | spec/lib/gitlab/jira_import/labels_importer_spec.rb | 1 |
3 files changed, 0 insertions, 16 deletions
diff --git a/spec/lib/gitlab/jira_import/base_importer_spec.rb b/spec/lib/gitlab/jira_import/base_importer_spec.rb index ecaf3def589..3bccb2395d6 100644 --- a/spec/lib/gitlab/jira_import/base_importer_spec.rb +++ b/spec/lib/gitlab/jira_import/base_importer_spec.rb @@ -8,24 +8,10 @@ describe Gitlab::JiraImport::BaseImporter do let(:project) { create(:project) } describe 'with any inheriting class' do - context 'when an error is returned from the project validation' do - before do - stub_feature_flags(jira_issue_import: false) - - allow(project).to receive(:validate_jira_import_settings!) - .and_raise(Projects::ImportService::Error, 'Jira import feature is disabled.') - end - - it 'raises exception' do - expect { described_class.new(project) }.to raise_error(Projects::ImportService::Error, 'Jira import feature is disabled.') - end - end - context 'when project validation is ok' do let!(:jira_service) { create(:jira_service, project: project) } before do - stub_feature_flags(jira_issue_import: true) stub_jira_service_test allow(project).to receive(:validate_jira_import_settings!) diff --git a/spec/lib/gitlab/jira_import/issues_importer_spec.rb b/spec/lib/gitlab/jira_import/issues_importer_spec.rb index 436fb139b36..0d790f49450 100644 --- a/spec/lib/gitlab/jira_import/issues_importer_spec.rb +++ b/spec/lib/gitlab/jira_import/issues_importer_spec.rb @@ -14,7 +14,6 @@ describe Gitlab::JiraImport::IssuesImporter do subject { described_class.new(project) } before do - stub_feature_flags(jira_issue_import: true) stub_jira_service_test end diff --git a/spec/lib/gitlab/jira_import/labels_importer_spec.rb b/spec/lib/gitlab/jira_import/labels_importer_spec.rb index 67eb541d376..19661ff4e73 100644 --- a/spec/lib/gitlab/jira_import/labels_importer_spec.rb +++ b/spec/lib/gitlab/jira_import/labels_importer_spec.rb @@ -15,7 +15,6 @@ describe Gitlab::JiraImport::LabelsImporter do subject { importer.execute } before do - stub_feature_flags(jira_issue_import: true) stub_const('Gitlab::JiraImport::LabelsImporter::MAX_LABELS', 2) end |