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
240b35b1
Commit
240b35b1
authored
Oct 19, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix commits spec
parent
2949f9b4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+3
-3
features/steps/project/commits/commits.rb
features/steps/project/commits/commits.rb
+2
-2
No files found.
app/views/projects/commit/_commit_box.html.haml
View file @
240b35b1
...
@@ -65,12 +65,12 @@
...
@@ -65,12 +65,12 @@
%span
.commit-info.branches
%span
.commit-info.branches
%i
.fa.fa-spinner.fa-spin
%i
.fa.fa-spinner.fa-spin
.widget-row.pipeline-info
-
if
@commit
.
status
-
if
@commit
.
status
.widget-row.pipeline-info
.icon-container
.icon-container
=
ci_icon_for_status
(
@commit
.
status
)
=
ci_icon_for_status
(
@commit
.
status
)
Pipeline
Pipeline
=
link_to
"#
#{
@commit
.
pipelines
.
la
st
.
id
}
"
,
pipelines_namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
),
class:
"monospace"
=
link_to
"#
#{
@commit
.
pipelines
.
fir
st
.
id
}
"
,
pipelines_namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
),
class:
"monospace"
for
for
=
link_to
@commit
.
short_id
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
),
class:
"monospace"
=
link_to
@commit
.
short_id
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
),
class:
"monospace"
%span
.ci-status-label
%span
.ci-status-label
...
...
features/steps/project/commits/commits.rb
View file @
240b35b1
...
@@ -163,7 +163,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
...
@@ -163,7 +163,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
end
end
step
'I see commit ci info'
do
step
'I see commit ci info'
do
expect
(
page
).
to
have_content
"
Builds for 1 pipeline
pending"
expect
(
page
).
to
have_content
"
Pipeline #1 for 570e7b2a
pending"
end
end
step
'I click status link'
do
step
'I click status link'
do
...
@@ -171,7 +171,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
...
@@ -171,7 +171,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
end
end
step
'I see builds list'
do
step
'I see builds list'
do
expect
(
page
).
to
have_content
"
Builds for 1 pipeline
pending"
expect
(
page
).
to
have_content
"
Pipeline #1 for 570e7b2a
pending"
expect
(
page
).
to
have_content
"1 build"
expect
(
page
).
to
have_content
"1 build"
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