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
Jérome Perrin
gitlab-ce
Commits
4ce2ca4d
Commit
4ce2ca4d
authored
Nov 15, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pipelines spec
parent
5ac2c583
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
app/views/projects/pipelines/_with_tabs.html.haml
app/views/projects/pipelines/_with_tabs.html.haml
+2
-2
spec/features/projects/commits/cherry_pick_spec.rb
spec/features/projects/commits/cherry_pick_spec.rb
+1
-1
spec/features/projects/pipelines_spec.rb
spec/features/projects/pipelines_spec.rb
+3
-5
No files found.
app/views/projects/pipelines/_with_tabs.html.haml
View file @
4ce2ca4d
.tabs-holder
%ul
.nav-links.no-top.no-bottom
%li
.active
=
link_to
"Pipeline"
,
"#js-tab-pipeline"
,
data:
{
target:
'#js-tab-pipeline'
,
action:
'pipeline'
,
toggle:
'tab'
}
=
link_to
"Pipeline"
,
"#js-tab-pipeline"
,
data:
{
target:
'#js-tab-pipeline'
,
action:
'pipeline'
,
toggle:
'tab'
}
,
class:
'pipeline-tab'
%li
=
link_to
"#js-tab-builds"
,
data:
{
target:
'#js-tab-builds'
,
action:
'build'
,
toggle:
'tab'
}
do
=
link_to
"#js-tab-builds"
,
data:
{
target:
'#js-tab-builds'
,
action:
'build'
,
toggle:
'tab'
}
,
class:
'builds-tab'
do
Builds
%span
.badge
=
pipeline
.
statuses
.
count
...
...
spec/features/projects/commits/cherry_pick_spec.rb
View file @
4ce2ca4d
...
...
@@ -64,7 +64,7 @@ describe 'Cherry-pick Commits' do
context
"I cherry-pick a commit from a different branch"
,
js:
true
do
it
do
find
(
'.
commit
-action-buttons a.dropdown-toggle'
).
click
find
(
'.
header
-action-buttons a.dropdown-toggle'
).
click
find
(
:css
,
"a[href='#modal-cherry-pick-commit']"
).
click
page
.
within
(
'#modal-cherry-pick-commit'
)
do
...
...
spec/features/projects/pipelines_spec.rb
View file @
4ce2ca4d
...
...
@@ -146,7 +146,8 @@ describe "Pipelines" do
end
describe
'GET /:project/pipelines/:id'
do
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
,
ref:
'master'
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
,
ref:
'master'
,
sha:
project
.
commit
.
id
)
}
before
do
@success
=
create
(
:ci_build
,
:success
,
pipeline:
pipeline
,
stage:
'build'
,
name:
'build'
)
...
...
@@ -156,10 +157,7 @@ describe "Pipelines" do
@external
=
create
(
:generic_commit_status
,
status:
'success'
,
pipeline:
pipeline
,
name:
'jenkins'
,
stage:
'external'
)
end
before
do
visit
namespace_project_pipeline_path
(
project
.
namespace
,
project
,
pipeline
)
find
(
'.builds-tab'
).
click
end
before
{
visit
namespace_project_pipeline_path
(
project
.
namespace
,
project
,
pipeline
)
}
it
'shows a list of builds'
do
expect
(
page
).
to
have_content
(
'Test'
)
...
...
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