diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-07-30 04:11:43 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-07-30 04:11:43 +0300 |
| commit | 1f9992625ed8a954dde5b8e662e764c48598104d (patch) | |
| tree | 07a4873d2de8dba00413175fa1bb994372e0e96b /spec/lib | |
| parent | 8b3c7f57b249b087a36eb36588223d1c7c4dbafe (diff) | |
| parent | 87f03f01735fb4b6dbef2e4bf625cf2546523a4e (diff) | |
Merge branch 'master-ce' into artifact-format-v2
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/import_export/project_tree_restorer_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb index bac5693c830..a88ac0a091e 100644 --- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb @@ -16,7 +16,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do @shared = @project.import_export_shared allow(@shared).to receive(:export_path).and_return('spec/lib/gitlab/import_export/') - allow_any_instance_of(Repository).to receive(:fetch_ref).and_return(true) + allow_any_instance_of(Repository).to receive(:fetch_source_branch!).and_return(true) allow_any_instance_of(Gitlab::Git::Repository).to receive(:branch_exists?).and_return(false) expect_any_instance_of(Gitlab::Git::Repository).to receive(:create_branch).with('feature', 'DCBA') |