summaryrefslogtreecommitdiff
path: root/spec/presenters/merge_request_presenter_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/presenters/merge_request_presenter_spec.rb')
-rw-r--r--spec/presenters/merge_request_presenter_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/presenters/merge_request_presenter_spec.rb b/spec/presenters/merge_request_presenter_spec.rb
index 0dd4ede5538..2187be0190d 100644
--- a/spec/presenters/merge_request_presenter_spec.rb
+++ b/spec/presenters/merge_request_presenter_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe MergeRequestPresenter do
let(:resource) { create :merge_request, source_project: project }
- let(:project) { create :empty_project }
+ let(:project) { create :project }
let(:user) { create(:user) }
describe '#ci_status' do
@@ -71,7 +71,7 @@ describe MergeRequestPresenter do
end
describe '#conflict_resolution_path' do
- let(:project) { create :empty_project }
+ let(:project) { create :project }
let(:user) { create :user }
let(:presenter) { described_class.new(resource, current_user: user) }
let(:path) { presenter.conflict_resolution_path }