summaryrefslogtreecommitdiff
path: root/spec/workers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-28 03:08:41 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-28 03:08:41 +0000
commita22f031743db01e51ee4f85c3368aa21cf8ac729 (patch)
tree58b4aabab8e8acfd684b63b05da2cd2cb6a177a6 /spec/workers
parentd690a8d62bc0abd5ab937822ff7a1b9f1e7b1a91 (diff)
downloadgitlab-ce-a22f031743db01e51ee4f85c3368aa21cf8ac729.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers')
-rw-r--r--spec/workers/concerns/gitlab/github_import/rescheduling_methods_spec.rb2
-rw-r--r--spec/workers/concerns/gitlab/github_import/stage_methods_spec.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/spec/workers/concerns/gitlab/github_import/rescheduling_methods_spec.rb b/spec/workers/concerns/gitlab/github_import/rescheduling_methods_spec.rb
index 09d64fe50bd..8727756ce50 100644
--- a/spec/workers/concerns/gitlab/github_import/rescheduling_methods_spec.rb
+++ b/spec/workers/concerns/gitlab/github_import/rescheduling_methods_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe Gitlab::GithubImport::ReschedulingMethods do
end
context 'with an existing project' do
- let(:project) { create(:project) }
+ let(:project) { create(:project, import_url: 'https://t0ken@github.com/repo/repo.git') }
it 'notifies any waiters upon successfully importing the data' do
expect(worker)
diff --git a/spec/workers/concerns/gitlab/github_import/stage_methods_spec.rb b/spec/workers/concerns/gitlab/github_import/stage_methods_spec.rb
index b7635748498..03e875bcb87 100644
--- a/spec/workers/concerns/gitlab/github_import/stage_methods_spec.rb
+++ b/spec/workers/concerns/gitlab/github_import/stage_methods_spec.rb
@@ -9,6 +9,8 @@ RSpec.describe Gitlab::GithubImport::StageMethods do
end
describe '#perform' do
+ let(:project) { create(:project, import_url: 'https://t0ken@github.com/repo/repo.git') }
+
it 'returns if no project could be found' do
expect(worker).not_to receive(:try_import)