diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-18 11:22:22 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-18 11:32:11 +0200 |
commit | 829a708a970b31afdcda21fff072eda0c61dfd4c (patch) | |
tree | f650fc5ce7a421bdf3d94899705b1cba7ef8c21d /spec/features/merge_requests/widget_deployments_spec.rb | |
parent | e35af6e25eae3f9323bd2a72cbc16f9cc4559e17 (diff) | |
download | gitlab-ce-829a708a970b31afdcda21fff072eda0c61dfd4c.tar.gz |
Fix remaining specs failures
Diffstat (limited to 'spec/features/merge_requests/widget_deployments_spec.rb')
-rw-r--r-- | spec/features/merge_requests/widget_deployments_spec.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/spec/features/merge_requests/widget_deployments_spec.rb b/spec/features/merge_requests/widget_deployments_spec.rb index 0c8ee844b47..1be35b27d84 100644 --- a/spec/features/merge_requests/widget_deployments_spec.rb +++ b/spec/features/merge_requests/widget_deployments_spec.rb @@ -9,9 +9,8 @@ feature 'Widget Deployments Header', feature: true, js: true do given(:merge_request) { create(:merge_request, :merged) } given(:environment) { create(:environment, project: project) } given(:role) { :developer } - given!(:deployment) do - create(:deployment, environment: environment, sha: project.commit('master').id) - end + given(:sha) { project.commit('master').id } + given!(:deployment) { create(:deployment, environment: environment, sha: sha) } given!(:manual) { } background do @@ -31,7 +30,10 @@ feature 'Widget Deployments Header', feature: true, js: true do given(:pipeline) { create(:ci_pipeline, project: project) } given(:build) { create(:ci_build, pipeline: pipeline) } given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'close_app') } - given(:deployment) { create(:deployment, environment: environment, deployable: build, on_stop: 'close_app') } + given(:deployment) do + create(:deployment, environment: environment, ref: merge_request.target_branch, + sha: sha, deployable: build, on_stop: 'close_app') + end background do wait_for_ajax |