diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-05 15:07:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-05 15:07:43 +0300 |
| commit | 872319738757edc0483346c75a2407f7019b963f (patch) | |
| tree | d5953edec6184dda1f53c5994c3ebcebc9e815a2 /spec/features/merge_request | |
| parent | 8f764d21b0011056e1492d92afe3bd40b847b9f7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request')
| -rw-r--r-- | spec/features/merge_request/user_sees_deployment_widget_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_sees_deployment_widget_spec.rb b/spec/features/merge_request/user_sees_deployment_widget_spec.rb index cdffd2ae2f6..3743ef0f25d 100644 --- a/spec/features/merge_request/user_sees_deployment_widget_spec.rb +++ b/spec/features/merge_request/user_sees_deployment_widget_spec.rb @@ -96,7 +96,7 @@ describe 'Merge request > User sees deployment widget', :js do visit project_merge_request_path(project, merge_request) wait_for_requests - expect(page).to have_content("Failed to deploy to #{environment.name}") + expect(page).to have_content("Canceled deploy to #{environment.name}") expect(page).not_to have_css('.js-deploy-time') end end |