diff options
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue | 7 | ||||
| -rw-r--r-- | doc/ci/cloud_deployment/index.md | 2 | ||||
| -rw-r--r-- | qa/qa/page/merge_request/show.rb | 10 |
3 files changed, 17 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue index 11bc8c73ee9..75d1e5865b0 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue @@ -84,7 +84,12 @@ export default { <span v-else> {{ s__('mrWidget|Merge failed.') }} </span> <span :class="{ 'has-custom-error': mr.mergeError }"> {{ timerText }} </span> </span> - <button class="btn btn-default btn-sm js-refresh-button" type="button" @click="refresh"> + <button + class="btn btn-default btn-sm js-refresh-button" + data-qa-selector="merge_request_error_content" + type="button" + @click="refresh" + > {{ s__('mrWidget|Refresh now') }} </button> </div> diff --git a/doc/ci/cloud_deployment/index.md b/doc/ci/cloud_deployment/index.md index f7dfe37da7a..3f133cd039d 100644 --- a/doc/ci/cloud_deployment/index.md +++ b/doc/ci/cloud_deployment/index.md @@ -16,7 +16,7 @@ cloud provider more easily. GitLab's AWS Docker image provides the [AWS Command Line Interface](https://aws.amazon.com/cli/), which enables you to run `aws` commands. As part of your deployment strategy, you can run `aws` commands directly from -`.gitlab-ci.yml` by specifying GitLab's AWS Docker image. +`.gitlab-ci.yml` by specifying [GitLab's AWS Docker image](https://gitlab.com/gitlab-org/cloud-deploy). Some credentials are required to be able to run `aws` commands: diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index c3645a6a755..d54ba5a5a8d 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -29,6 +29,10 @@ module QA element :merged_status_content end + view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue' do + element :merge_request_error_content + end + view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue' do element :mr_rebase_button element :no_fast_forward_message, 'Fast-forward merge is not possible' # rubocop:disable QA/ElementWithPattern @@ -193,6 +197,12 @@ module QA click_element :dropdown_toggle visit_link_in_element(:download_plain_diff) end + + def wait_for_merge_request_error_message + wait(max: 30, reload: false) do + has_element?(:merge_request_error_content) + end + end end end end |