summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-11-17 16:15:10 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-11-17 16:15:10 +0100
commit9b0e7b9041bf52a5e81c658a149efca77c8a2d10 (patch)
tree06ccbd110ce4c645eae40e9d22a05a3fafec1a07
parent54ee0df78a3e025ff2c1250d20e8518c9753ff34 (diff)
downloadgitlab-ce-9b0e7b9041bf52a5e81c658a149efca77c8a2d10.tar.gz
Fix test case for environments related to deployments
-rw-r--r--spec/features/environments_spec.rb21
1 files changed, 14 insertions, 7 deletions
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb
index aef38f9f407..9c15a815d0d 100644
--- a/spec/features/environments_spec.rb
+++ b/spec/features/environments_spec.rb
@@ -74,24 +74,31 @@ feature 'Environments', feature: true, js: true do
context 'with build and manual actions' do
given(:pipeline) { create(:ci_pipeline, project: project) }
given(:build) { create(:ci_build, pipeline: pipeline) }
- given(:deployment) { create(:deployment, environment: environment, deployable: build) }
- given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'deploy to production') }
+
+ given(:manual) do
+ create(:ci_build, :manual, pipeline: pipeline, name: 'deploy to production')
+ end
+
+ given(:deployment) do
+ create(:deployment, environment: environment,
+ deployable: build,
+ sha: project.commit.id)
+ end
scenario 'does show a play button' do
find('.dropdown-play-icon-container').click
expect(page).to have_content(manual.name.humanize)
end
- scenario 'does allow to play manual action' do
+ scenario 'does allow to play manual action', js: true do
expect(manual).to be_skipped
find('.dropdown-play-icon-container').click
- play_action = find('span', text: manual.name.humanize)
-
expect(page).to have_content(manual.name.humanize)
- expect { play_action.click }.not_to change { Ci::Pipeline.count }
- # TODO, fix me!
+ expect { click_link(manual.name.humanize) }
+ .not_to change { Ci::Pipeline.count }
+
expect(manual.reload).to be_pending
end