diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-06-11 19:37:43 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-06-11 14:38:35 -0500 |
| commit | 128b3a89a576b25fd8939ca1390b77eff031251a (patch) | |
| tree | 36e9f8ad4270f8af7ff4e8420e47e8dc4abfa2a7 | |
| parent | aba6f19c2ab2418418f5e5e1c64dcb85a6732a01 (diff) | |
| download | gitlab-ce-128b3a89a576b25fd8939ca1390b77eff031251a.tar.gz | |
Merge branch 'sh-relax-project-import-spec' into 'master'
Relax expectation in spec/models/project_spec.rb
See merge request gitlab-org/gitlab-ce!19663
| -rw-r--r-- | spec/models/project_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 24c99a7929a..9ee2070efd9 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -1727,7 +1727,7 @@ describe Project do .and_return(true) # Works around https://github.com/rspec/rspec-mocks/issues/910 - expect(described_class).to receive(:find).with(project.id).twice.and_return(project) + allow(described_class).to receive(:find).with(project.id).and_return(project) expect(project.repository).to receive(:after_import) .and_call_original expect(project.wiki.repository).to receive(:after_import) |