diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-08 08:37:06 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-01-08 08:37:06 +0000 |
| commit | 15f7f52b4034d4ede3b923e95df6884f36194245 (patch) | |
| tree | 674772a3acaa716b2dd938defe0f66c63bd0970f /spec/workers | |
| parent | 2c66b942bde756554b22d8b54c586fe45f544b0e (diff) | |
| parent | 819fc98fed227487b0a273ee294e374e7457782b (diff) | |
| download | gitlab-ce-15f7f52b4034d4ede3b923e95df6884f36194245.tar.gz | |
Merge branch '3968-protected-branch-is-not-set-for-default-branch-on-import' into 'master'
Protected branch is now created for default branch on import
Closes #3968
See merge request gitlab-org/gitlab-ce!16198
Diffstat (limited to 'spec/workers')
| -rw-r--r-- | spec/workers/repository_import_worker_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/workers/repository_import_worker_spec.rb b/spec/workers/repository_import_worker_spec.rb index 85ac14eb347..7274a9f00f9 100644 --- a/spec/workers/repository_import_worker_spec.rb +++ b/spec/workers/repository_import_worker_spec.rb @@ -32,6 +32,7 @@ describe RepositoryImportWorker do expect_any_instance_of(Projects::ImportService).to receive(:execute) .and_return({ status: :ok }) + expect_any_instance_of(Project).to receive(:after_import).and_call_original expect_any_instance_of(Repository).to receive(:expire_emptiness_caches) expect_any_instance_of(Project).to receive(:import_finish) |