Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
adccf3b4
Commit
adccf3b4
authored
Apr 01, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix facotries
parent
f5dec306
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
spec/factories.rb
spec/factories.rb
+1
-1
spec/features/notes_on_merge_requests_spec.rb
spec/features/notes_on_merge_requests_spec.rb
+2
-2
No files found.
spec/factories.rb
View file @
adccf3b4
...
@@ -77,7 +77,7 @@ FactoryGirl.define do
...
@@ -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"
...
...
spec/features/notes_on_merge_requests_spec.rb
View file @
adccf3b4
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
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment