diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-06-11 19:37:43 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-06-11 19:37:43 +0000 |
| commit | 493adfad16f3b9d09c60458bd13ae6de21651ca4 (patch) | |
| tree | 90cf899ba7690d34717ad7527b1ad258e6596ec1 | |
| parent | fa1a75ae28b421c5d3bd926c2795a053e4c6af15 (diff) | |
| parent | 072f9224afded08cb1c93fa0e6c077928f60cca0 (diff) | |
| download | gitlab-ce-493adfad16f3b9d09c60458bd13ae6de21651ca4.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 a7a6d0bb09c..926365e409a 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -1734,7 +1734,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) |