Commit 493adfad authored by Mayra Cabrera's avatar Mayra Cabrera

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
parents fa1a75ae 072f9224
...@@ -1734,7 +1734,7 @@ describe Project do ...@@ -1734,7 +1734,7 @@ describe Project do
.and_return(true) .and_return(true)
# Works around https://github.com/rspec/rspec-mocks/issues/910 # 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) expect(project.repository).to receive(:after_import)
.and_call_original .and_call_original
expect(project.wiki.repository).to receive(:after_import) expect(project.wiki.repository).to receive(:after_import)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment