Commit d01e5a04 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'revert-3755d828' into 'master'

Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"

See merge request gitlab-org/gitlab-ce!20525
parents 7358211e 191d8ecf
...@@ -200,7 +200,7 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea" ...@@ -200,7 +200,7 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea"
class="btn btn-cancel note-edit-cancel js-close-discussion-note-form" class="btn btn-cancel note-edit-cancel js-close-discussion-note-form"
type="button" type="button"
@click="cancelHandler()"> @click="cancelHandler()">
{{ __('Discard draft') }} Cancel
</button> </button>
</div> </div>
</form> </form>
......
...@@ -40,5 +40,5 @@ ...@@ -40,5 +40,5 @@
= yield(:note_actions) = yield(:note_actions)
%a.btn.btn-cancel.js-note-discard{ role: "button", data: {cancel_text: "Discard draft" } } %a.btn.btn-cancel.js-note-discard{ role: "button", data: {cancel_text: "Cancel" } }
Discard draft Discard draft
...@@ -62,7 +62,7 @@ describe "User adds a comment on a commit", :js do ...@@ -62,7 +62,7 @@ describe "User adds a comment on a commit", :js do
click_diff_line(sample_commit.line_code) click_diff_line(sample_commit.line_code)
expect(page).to have_css(".js-temp-notes-holder form.new-note") 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. # The `Cancel` button closes the current form. The page should not have any open forms after that.
find(".js-close-discussion-note-form").click find(".js-close-discussion-note-form").click
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment