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
Boxiang Sun
gitlab-ce
Commits
bd72c74d
Commit
bd72c74d
authored
Jul 31, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dashboard tests
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
394ac378
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
features/steps/dashboard/dashboard.rb
features/steps/dashboard/dashboard.rb
+2
-2
features/steps/shared/project.rb
features/steps/shared/project.rb
+3
-3
No files found.
features/steps/dashboard/dashboard.rb
View file @
bd72c74d
...
...
@@ -12,7 +12,7 @@ class Dashboard < Spinach::FeatureSteps
end
Then
'I should see last push widget'
do
page
.
should
have_content
"You pushed to
new_design
"
page
.
should
have_content
"You pushed to
fix
"
page
.
should
have_link
"Create Merge Request"
end
...
...
@@ -23,7 +23,7 @@ class Dashboard < Spinach::FeatureSteps
Then
'I see prefilled new Merge Request page'
do
current_path
.
should
==
new_project_merge_request_path
(
@project
)
find
(
"#merge_request_target_project_id"
).
value
.
should
==
@project
.
id
.
to_s
find
(
"#merge_request_source_branch"
).
value
.
should
==
"
new_design
"
find
(
"#merge_request_source_branch"
).
value
.
should
==
"
fix
"
find
(
"#merge_request_target_branch"
).
value
.
should
==
"master"
end
...
...
features/steps/shared/project.rb
View file @
bd72c74d
...
...
@@ -26,8 +26,8 @@ module SharedProject
data
=
{
before:
"0000000000000000000000000000000000000000"
,
after:
"
0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e
"
,
ref:
"refs/heads/
new_design
"
,
after:
"
6d394385cf567f80a8fd85055db1ab4c5295806f
"
,
ref:
"refs/heads/
fix
"
,
user_id:
@user
.
id
,
user_name:
@user
.
name
,
repository:
{
...
...
@@ -49,7 +49,7 @@ module SharedProject
Then
'I should see project "Shop" activity feed'
do
project
=
Project
.
find_by
(
name:
"Shop"
)
page
.
should
have_content
"
#{
@user
.
name
}
pushed new branch
new_design
at
#{
project
.
name_with_namespace
}
"
page
.
should
have_content
"
#{
@user
.
name
}
pushed new branch
fix
at
#{
project
.
name_with_namespace
}
"
end
Then
'I should see project settings'
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