Commit adccf3b49912df4ea630eb6e96e34204ddf932e6
1 parent
f5dec306
Exists in
master
and in
4 other branches
fix facotries
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
spec/factories.rb
| @@ -77,7 +77,7 @@ FactoryGirl.define do | @@ -77,7 +77,7 @@ FactoryGirl.define do | ||
| 77 | factory :merge_request do | 77 | factory :merge_request do |
| 78 | title | 78 | title |
| 79 | author | 79 | author |
| 80 | - project | 80 | + project factory: :project_with_code |
| 81 | source_branch "master" | 81 | source_branch "master" |
| 82 | target_branch "stable" | 82 | target_branch "stable" |
| 83 | 83 |
spec/features/notes_on_merge_requests_spec.rb
| 1 | require 'spec_helper' | 1 | require 'spec_helper' |
| 2 | 2 | ||
| 3 | describe "On a merge request", js: true do | 3 | describe "On a merge request", js: true do |
| 4 | - let!(:project) { create(:project) } | 4 | + let!(:project) { create(:project_with_code) } |
| 5 | let!(:merge_request) { create(:merge_request, project: project) } | 5 | let!(:merge_request) { create(:merge_request, project: project) } |
| 6 | 6 | ||
| 7 | before do | 7 | before do |
| @@ -83,7 +83,7 @@ end | @@ -83,7 +83,7 @@ end | ||
| 83 | 83 | ||
| 84 | 84 | ||
| 85 | describe "On a merge request diff", js: true, focus: true do | 85 | describe "On a merge request diff", js: true, focus: true do |
| 86 | - let!(:project) { create(:project) } | 86 | + let!(:project) { create(:project_with_code) } |
| 87 | let!(:merge_request) { create(:merge_request_with_diffs, project: project) } | 87 | let!(:merge_request) { create(:merge_request_with_diffs, project: project) } |
| 88 | 88 | ||
| 89 | before do | 89 | before do |