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:23:47 +0200
commitd7b681512bb738b9b2ca0c56e761616a1a761295 (patch)
tree42d7bfa4de271bd87ffb7a1d2265094df80de5f3
parentad3e1edcfce1e24fb9889d5d73852680cf4facf9 (diff)
downloadgitlab-ce-d7b681512bb738b9b2ca0c56e761616a1a761295.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 92fae78fe4e..6820b2d41a7 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -21,7 +21,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