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
742089ae
Commit
742089ae
authored
Dec 17, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix feature specs: we always show the build status if ci_commit is present
parent
58a56a03
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
23 deletions
+6
-23
spec/features/commits_spec.rb
spec/features/commits_spec.rb
+6
-23
No files found.
spec/features/commits_spec.rb
View file @
742089ae
...
@@ -19,8 +19,6 @@ describe 'Commits' do
...
@@ -19,8 +19,6 @@ describe 'Commits' do
let!
(
:build
)
{
FactoryGirl
.
create
:ci_build
,
commit:
commit
}
let!
(
:build
)
{
FactoryGirl
.
create
:ci_build
,
commit:
commit
}
describe
'Project commits'
do
describe
'Project commits'
do
context
'builds enabled'
do
context
'.gitlab-ci.yml found'
do
before
do
before
do
visit
namespace_project_commits_path
(
project
.
namespace
,
project
,
:master
)
visit
namespace_project_commits_path
(
project
.
namespace
,
project
,
:master
)
end
end
...
@@ -32,21 +30,6 @@ describe 'Commits' do
...
@@ -32,21 +30,6 @@ describe 'Commits' do
end
end
end
end
context
'no .gitlab-ci.yml found'
do
before
do
stub_ci_commit_yaml_file
(
nil
)
visit
namespace_project_commits_path
(
project
.
namespace
,
project
,
:master
)
end
it
'should not show build status'
do
page
.
within
(
"//li[@id='commit-
#{
commit
.
short_sha
}
']"
)
do
expect
(
page
).
to
have_no_css
(
".ci-status-link"
)
end
end
end
end
end
describe
'Commit builds'
do
describe
'Commit builds'
do
before
do
before
do
visit
ci_status_path
(
commit
)
visit
ci_status_path
(
commit
)
...
...
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