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
a391652f
Commit
a391652f
authored
Aug 12, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test failures
parent
160aaca0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+1
-1
spec/features/projects/pipelines_spec.rb
spec/features/projects/pipelines_spec.rb
+1
-1
No files found.
app/models/ci/pipeline.rb
View file @
a391652f
...
@@ -23,7 +23,7 @@ module Ci
...
@@ -23,7 +23,7 @@ module Ci
state_machine
:status
,
initial: :created
do
state_machine
:status
,
initial: :created
do
event
:queue
do
event
:queue
do
transition
:created
=>
:pending
transition
created:
:pending
transition
any
-
[
:created
,
:pending
]
=>
:running
transition
any
-
[
:created
,
:pending
]
=>
:running
end
end
...
...
spec/features/projects/pipelines_spec.rb
View file @
a391652f
...
@@ -64,7 +64,7 @@ describe "Pipelines" do
...
@@ -64,7 +64,7 @@ describe "Pipelines" do
before
{
click_link
(
'Retry'
)
}
before
{
click_link
(
'Retry'
)
}
it
{
expect
(
page
).
not_to
have_link
(
'Retry'
)
}
it
{
expect
(
page
).
not_to
have_link
(
'Retry'
)
}
it
{
expect
(
page
).
to
have_selector
(
'.ci-
pend
ing'
)
}
it
{
expect
(
page
).
to
have_selector
(
'.ci-
runn
ing'
)
}
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