deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix facotries

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-04-01 18:24:05 +03:00
parent f5dec306fd
commit adccf3b499
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spec/factories.rb
View file

@ -77,7 +77,7 @@ FactoryGirl.define do
factory :merge_request do factory :merge_request do
title title
author author
project project factory: :project_with_code
source_branch "master" source_branch "master"
target_branch "stable" target_branch "stable"

4
spec/features/notes_on_merge_requests_spec.rb
View file

@ -1,7 +1,7 @@
require 'spec_helper' require 'spec_helper'
describe "On a merge request", js: true do describe "On a merge request", js: true do
let!(:project) { create(:project) } let!(:project) { create(:project_with_code) }
let!(:merge_request) { create(:merge_request, project: project) } let!(:merge_request) { create(:merge_request, project: project) }
before do before do
@ -83,7 +83,7 @@ end
describe "On a merge request diff", js: true, focus: true do describe "On a merge request diff", js: true, focus: true do
let!(:project) { create(:project) } let!(:project) { create(:project_with_code) }
let!(:merge_request) { create(:merge_request_with_diffs, project: project) } let!(:merge_request) { create(:merge_request_with_diffs, project: project) }
before do before do