BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
72d42944
Commit
72d42944
authored
May 18, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs
parent
be1351cd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
todos.rb
features/steps/dashboard/todos.rb
+1
-1
form_spec.rb
spec/features/merge_requests/form_spec.rb
+1
-1
No files found.
features/steps/dashboard/todos.rb
View file @
72d42944
...
@@ -138,7 +138,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
...
@@ -138,7 +138,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
end
end
step
'I should be directed to the corresponding page'
do
step
'I should be directed to the corresponding page'
do
page
.
should
have_css
(
'.identifier'
,
text:
'Merge
R
equest !1'
)
page
.
should
have_css
(
'.identifier'
,
text:
'Merge
r
equest !1'
)
# Merge request page loads and issues a number of Ajax requests
# Merge request page loads and issues a number of Ajax requests
wait_for_ajax
wait_for_ajax
end
end
...
...
spec/features/merge_requests/form_spec.rb
View file @
72d42944
...
@@ -90,7 +90,7 @@ describe 'New/edit merge request', feature: true, js: true do
...
@@ -90,7 +90,7 @@ describe 'New/edit merge request', feature: true, js: true do
page
.
within
'.issuable-meta'
do
page
.
within
'.issuable-meta'
do
merge_request
=
MergeRequest
.
find_by
(
source_branch:
'fix'
)
merge_request
=
MergeRequest
.
find_by
(
source_branch:
'fix'
)
expect
(
page
).
to
have_text
(
"Merge
R
equest
#{
merge_request
.
to_reference
}
"
)
expect
(
page
).
to
have_text
(
"Merge
r
equest
#{
merge_request
.
to_reference
}
"
)
# compare paths because the host differ in test
# compare paths because the host differ in test
expect
(
find_link
(
merge_request
.
to_reference
)[
:href
])
expect
(
find_link
(
merge_request
.
to_reference
)[
:href
])
.
to
end_with
(
merge_request_path
(
merge_request
))
.
to
end_with
(
merge_request_path
(
merge_request
))
...
...
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