Commit adccf3b4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

fix facotries

parent f5dec306
......@@ -77,7 +77,7 @@ FactoryGirl.define do
factory :merge_request do
title
author
project
project factory: :project_with_code
source_branch "master"
target_branch "stable"
......
require 'spec_helper'
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) }
before do
......@@ -83,7 +83,7 @@ end
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) }
before do
......
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