summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-08-12 12:23:47 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-08-12 12:25:03 +0200
commita391652fe60930e2139ecfacb175da6aa0f3b1e9 (patch)
tree82468d0216f0a1b65c1399b0179c61e4e2ed4151
parent160aaca0fbfaa9848dec769019df9c0c78059b56 (diff)
downloadgitlab-ce-a391652fe60930e2139ecfacb175da6aa0f3b1e9.tar.gz
Fix test failures
-rw-r--r--app/models/ci/pipeline.rb2
-rw-r--r--spec/features/projects/pipelines_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index ad836bbebb8..98185ecd447 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -23,7 +23,7 @@ module Ci
state_machine :status, initial: :created do
event :queue do
- transition :created => :pending
+ transition created: :pending
transition any - [:created, :pending] => :running
end
diff --git a/spec/features/projects/pipelines_spec.rb b/spec/features/projects/pipelines_spec.rb
index b57652b3ea2..29d150bc597 100644
--- a/spec/features/projects/pipelines_spec.rb
+++ b/spec/features/projects/pipelines_spec.rb
@@ -64,7 +64,7 @@ describe "Pipelines" do
before { click_link('Retry') }
it { expect(page).not_to have_link('Retry') }
- it { expect(page).to have_selector('.ci-pending') }
+ it { expect(page).to have_selector('.ci-running') }
end
end