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
11ad7444
Commit
11ad7444
authored
Apr 26, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure Spinach features with JS waits for requests to complete
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
60a5273d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
features/support/env.rb
features/support/env.rb
+8
-1
No files found.
features/support/env.rb
View file @
11ad7444
...
@@ -10,7 +10,7 @@ if ENV['CI']
...
@@ -10,7 +10,7 @@ if ENV['CI']
Knapsack
::
Adapters
::
SpinachAdapter
.
bind
Knapsack
::
Adapters
::
SpinachAdapter
.
bind
end
end
%w(select2_helper test_env repo_helpers wait_for_ajax sidekiq)
.
each
do
|
f
|
%w(select2_helper test_env repo_helpers wait_for_ajax
wait_for_requests
sidekiq)
.
each
do
|
f
|
require
Rails
.
root
.
join
(
'spec'
,
'support'
,
f
)
require
Rails
.
root
.
join
(
'spec'
,
'support'
,
f
)
end
end
...
@@ -30,6 +30,13 @@ Spinach.hooks.before_run do
...
@@ -30,6 +30,13 @@ Spinach.hooks.before_run do
include
FactoryGirl
::
Syntax
::
Methods
include
FactoryGirl
::
Syntax
::
Methods
end
end
Spinach
.
hooks
.
after_feature
do
|
feature_data
|
if
feature_data
.
scenarios
.
flat_map
(
&
:tags
).
include?
(
'javascript'
)
include
WaitForRequests
wait_for_requests_complete
end
end
module
StdoutReporterWithScenarioLocation
module
StdoutReporterWithScenarioLocation
# Override the standard reporter to show filename and line number next to each
# Override the standard reporter to show filename and line number next to each
# scenario for easy, focused re-runs
# scenario for easy, focused re-runs
...
...
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