summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2019-07-29 19:14:09 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2019-07-29 19:14:09 +0000
commit8cc0c02d8befaacf598b7855b2d025a0e544e1dd (patch)
tree853acf46d8f691dcce8bbbcf17c2435603d2edb3
parented80d3e95b64caab541ffd33aba2e0e6f2f94bdd (diff)
parente8e4821bce5a9796836fbf705bce1a73aef275c3 (diff)
downloadgitlab-ce-8cc0c02d8befaacf598b7855b2d025a0e544e1dd.tar.gz
Merge branch 'tp-qtt182-3' into 'master'
Change qa-create-page-button to rspec-create-page-button Closes gitlab-org/quality/team-tasks#182 See merge request gitlab-org/gitlab-ce!31204
-rw-r--r--app/views/projects/wikis/_form.html.haml2
-rw-r--r--spec/features/projects/wiki/user_creates_wiki_page_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 5bb69563b51..66a614b0197 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -51,6 +51,6 @@
.float-right
= link_to _("Cancel"), project_wiki_path(@project, @page), class: 'btn btn-cancel btn-grouped'
- else
- = f.submit s_("Wiki|Create page"), class: 'btn-success btn qa-create-page-button'
+ = f.submit s_("Wiki|Create page"), class: 'btn-success btn qa-create-page-button rspec-create-page-button'
.float-right
= link_to _("Cancel"), project_wiki_path(@project, :home), class: 'btn btn-cancel'
diff --git a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
index 6be0565eaf5..1080976f7ce 100644
--- a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
@@ -142,7 +142,7 @@ describe "User creates wiki page" do
# blur. Just not `click`. But only when you manually insert \n or \r - if you manually insert any other sequence
# then `click` is fired normally. And it's only Capybara. Browsers and JSDOM don't have this issue.
# So that's why the next line performs the click via JS.
- page.execute_script("document.querySelector('.qa-create-page-button').click()")
+ page.execute_script("document.querySelector('.rspec-create-page-button').click()")
page.within ".md" do
expect(page).to have_selector(".katex", count: 3).and have_content("2+2 is 4")