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
ce0811ae
Commit
ce0811ae
authored
Feb 06, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve tests
parent
f9e6f668
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
features/steps/project/forked_merge_requests.rb
features/steps/project/forked_merge_requests.rb
+4
-4
features/steps/project/source/browse_files.rb
features/steps/project/source/browse_files.rb
+1
-1
No files found.
features/steps/project/forked_merge_requests.rb
View file @
ce0811ae
...
...
@@ -70,8 +70,8 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
find
(
"#merge_request_source_branch"
).
value
.
should
have_content
"new_design"
find
(
"#merge_request_target_branch"
).
value
.
should
have_content
"master"
find
(
"#merge_request_title"
).
value
.
should
==
"New Design"
verify_commit_link
(
".mr_target_commit"
,
@project
)
verify_commit_link
(
".mr_source_commit"
,
@forked_project
)
verify_commit_link
(
".mr_target_commit"
,
@project
)
verify_commit_link
(
".mr_source_commit"
,
@forked_project
)
end
step
'I update the merge request title'
do
...
...
@@ -114,7 +114,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
step
'I fill out an invalid "Merge Request On Forked Project" merge request'
do
select
"Select branch"
,
from:
"merge_request_target_branch"
find
(
:select
,
"merge_request_source_project_id"
,
{}).
value
.
should
==
@forked_project
.
id
.
to_s
find
(
:select
,
"merge_request_target_project_id"
,
{}).
value
.
should
==
project
.
id
.
to_s
find
(
:select
,
"merge_request_target_project_id"
,
{}).
value
.
should
==
@
project
.
id
.
to_s
find
(
:select
,
"merge_request_source_branch"
,
{}).
value
.
should
==
""
find
(
:select
,
"merge_request_target_branch"
,
{}).
value
.
should
==
""
click_button
"Compare branches"
...
...
@@ -125,7 +125,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
end
step
'the target repository should be the original repository'
do
page
.
should
have_select
(
"merge_request_target_project_id"
,
selected:
project
.
path_with_namespace
)
page
.
should
have_select
(
"merge_request_target_project_id"
,
selected:
@
project
.
path_with_namespace
)
end
# Verify a link is generated against the correct project
...
...
features/steps/project/source/browse_files.rb
View file @
ce0811ae
...
...
@@ -174,7 +174,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
click_link
'add a file'
# Remove pre-receive hook so we can push without auth
FileUtils
.
rm
(
File
.
join
(
Project
.
las
t
.
repository
.
path
,
'hooks'
,
'pre-receive'
))
FileUtils
.
rm
(
File
.
join
(
@projec
t
.
repository
.
path
,
'hooks'
,
'pre-receive'
))
end
private
...
...
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