Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2018-07-10 15:38:15 +0300
committerWinnie Hellmann <winnie@gitlab.com>2018-07-10 15:38:15 +0300
commit191d8ecff6ece1a7f57b5d033cbe7405e4e06933 (patch)
tree8aece9650c5041478c29073e110076610059631b /spec/features/projects
parent6152d7a33e177f8b656f104a7e7d93c3a5562394 (diff)
Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"
This reverts merge request !20140
Diffstat (limited to 'spec/features/projects')
-rw-r--r--spec/features/projects/commit/comments/user_adds_comment_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/commit/comments/user_adds_comment_spec.rb b/spec/features/projects/commit/comments/user_adds_comment_spec.rb
index 53866c32c69..6397df086a7 100644
--- a/spec/features/projects/commit/comments/user_adds_comment_spec.rb
+++ b/spec/features/projects/commit/comments/user_adds_comment_spec.rb
@@ -62,7 +62,7 @@ describe "User adds a comment on a commit", :js do
click_diff_line(sample_commit.line_code)
expect(page).to have_css(".js-temp-notes-holder form.new-note")
- .and have_css(".js-close-discussion-note-form", text: "Discard draft")
+ .and have_css(".js-close-discussion-note-form", text: "Cancel")
# The `Cancel` button closes the current form. The page should not have any open forms after that.
find(".js-close-discussion-note-form").click