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
Léo-Paul Géneau
gitlab-ce
Commits
5ed2465c
Commit
5ed2465c
authored
May 02, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed tests
parent
ef7001c9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
spec/features/projects/merge_request_button_spec.rb
spec/features/projects/merge_request_button_spec.rb
+6
-6
No files found.
spec/features/projects/merge_request_button_spec.rb
View file @
5ed2465c
...
@@ -25,7 +25,7 @@ feature 'Merge Request button', feature: true do
...
@@ -25,7 +25,7 @@ feature 'Merge Request button', feature: true do
it
'shows Create merge request button'
do
it
'shows Create merge request button'
do
href
=
new_namespace_project_merge_request_path
(
project
.
namespace
,
href
=
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
project
,
merge_request:
{
source_branch:
"'test'"
,
merge_request:
{
source_branch:
'feature'
,
target_branch:
'master'
})
target_branch:
'master'
})
visit
url
visit
url
...
@@ -69,7 +69,7 @@ feature 'Merge Request button', feature: true do
...
@@ -69,7 +69,7 @@ feature 'Merge Request button', feature: true do
it
'shows Create merge request button'
do
it
'shows Create merge request button'
do
href
=
new_namespace_project_merge_request_path
(
forked_project
.
namespace
,
href
=
new_namespace_project_merge_request_path
(
forked_project
.
namespace
,
forked_project
,
forked_project
,
merge_request:
{
source_branch:
"'test'"
,
merge_request:
{
source_branch:
'feature'
,
target_branch:
'master'
})
target_branch:
'master'
})
visit
fork_url
visit
fork_url
...
@@ -93,16 +93,16 @@ feature 'Merge Request button', feature: true do
...
@@ -93,16 +93,16 @@ feature 'Merge Request button', feature: true do
context
'on compare page'
do
context
'on compare page'
do
it_behaves_like
'Merge request button only shown when allowed'
do
it_behaves_like
'Merge request button only shown when allowed'
do
let
(
:label
)
{
'Create merge request'
}
let
(
:label
)
{
'Create merge request'
}
let
(
:url
)
{
namespace_project_compare_path
(
project
.
namespace
,
project
,
from:
'master'
,
to:
"'test'"
)
}
let
(
:url
)
{
namespace_project_compare_path
(
project
.
namespace
,
project
,
from:
'master'
,
to:
'feature'
)
}
let
(
:fork_url
)
{
namespace_project_compare_path
(
forked_project
.
namespace
,
forked_project
,
from:
'master'
,
to:
"'test'"
)
}
let
(
:fork_url
)
{
namespace_project_compare_path
(
forked_project
.
namespace
,
forked_project
,
from:
'master'
,
to:
'feature'
)
}
end
end
end
end
context
'on commits page'
do
context
'on commits page'
do
it_behaves_like
'Merge request button only shown when allowed'
do
it_behaves_like
'Merge request button only shown when allowed'
do
let
(
:label
)
{
'Create merge request'
}
let
(
:label
)
{
'Create merge request'
}
let
(
:url
)
{
namespace_project_commits_path
(
project
.
namespace
,
project
,
"'test'"
)
}
let
(
:url
)
{
namespace_project_commits_path
(
project
.
namespace
,
project
,
'feature'
)
}
let
(
:fork_url
)
{
namespace_project_commits_path
(
forked_project
.
namespace
,
forked_project
,
"'test'"
)
}
let
(
:fork_url
)
{
namespace_project_commits_path
(
forked_project
.
namespace
,
forked_project
,
'feature'
)
}
end
end
end
end
end
end
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