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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
bac19f4c
Commit
bac19f4c
authored
Aug 17, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failing test
Test was not waiting for the page to be fully loaded
parent
43252ccb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
spec/features/merge_requests/create_new_mr_spec.rb
spec/features/merge_requests/create_new_mr_spec.rb
+7
-4
No files found.
spec/features/merge_requests/create_new_mr_spec.rb
View file @
bac19f4c
require
'spec_helper'
require
'spec_helper'
feature
'Create New Merge Request'
,
feature:
true
,
js:
true
do
feature
'Create New Merge Request'
,
feature:
true
,
js:
true
do
include
WaitForAjax
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
...
@@ -53,10 +55,11 @@ feature 'Create New Merge Request', feature: true, js: true do
...
@@ -53,10 +55,11 @@ feature 'Create New Merge Request', feature: true, js: true do
expect
(
page
.
find_link
(
'Side-by-side'
)[
:class
]).
not_to
match
(
/\bactive\b/
)
expect
(
page
.
find_link
(
'Side-by-side'
)[
:class
]).
not_to
match
(
/\bactive\b/
)
click_link
'Side-by-side'
click_link
'Side-by-side'
wait_for_ajax
click_link
'Changes'
within
'.merge-request'
do
expect
(
page
).
not_to
have_css
(
'a.btn.active'
,
text:
'Inline'
)
expect
(
page
.
find_link
(
'Inline'
)[
:class
]).
not_to
match
(
/\bactive\b/
)
expect
(
page
).
to
have_css
(
'a.btn.active'
,
text:
'Side-by-side'
)
e
xpect
(
page
.
find_link
(
'Side-by-side'
)[
:class
]).
to
match
(
/\bactive\b/
)
e
nd
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