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
cf7b1562
Commit
cf7b1562
authored
Nov 02, 2016
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reduced amount of failures in feature test - vue paints - .includes does not work
parent
5ba83d96
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
app/assets/javascripts/vue_pipelines_index/pipelines.vue.js.es6
...sets/javascripts/vue_pipelines_index/pipelines.vue.js.es6
+4
-2
spec/features/projects/pipelines_spec.rb
spec/features/projects/pipelines_spec.rb
+8
-2
No files found.
app/assets/javascripts/vue_pipelines_index/pipelines.vue.js.es6
View file @
cf7b1562
...
@@ -22,8 +22,10 @@
...
@@ -22,8 +22,10 @@
'store',
'store',
],
],
created() {
created() {
const url = window.location.href;
// ** `.includes` does not work in PhantomJS
if (url.includes('?')) this.pageNum = url.split('?')[1];
// const url = window.location.toString();
// if (url.includes('?')) this.pageNum = url.split('?')[1];
// now fetch page appropriate data
// now fetch page appropriate data
this.store.fetchDataLoop.call(this, Vue, this.pageNum);
this.store.fetchDataLoop.call(this, Vue, this.pageNum);
},
},
...
...
spec/features/projects/pipelines_spec.rb
View file @
cf7b1562
require
'spec_helper'
require
'spec_helper'
require
'rails_helper'
describe
"Pipelines"
do
describe
"Pipelines"
,
feature:
true
,
js:
true
do
include
GitlabRoutingHelper
include
GitlabRoutingHelper
include
WaitForAjax
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
...
@@ -20,7 +22,11 @@ describe "Pipelines" do
...
@@ -20,7 +22,11 @@ describe "Pipelines" do
before
{
visit
namespace_project_pipelines_path
(
project
.
namespace
,
project
,
scope:
scope
)
}
before
{
visit
namespace_project_pipelines_path
(
project
.
namespace
,
project
,
scope:
scope
)
}
it
{
expect
(
page
).
to
have_content
(
pipeline
.
short_sha
)
}
it
do
wait_for_ajax
expect
(
page
).
to
have_content
(
pipeline
.
short_sha
)
end
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