diff options
| author | Dan Davison <ddavison@gitlab.com> | 2019-01-31 19:07:14 +0000 |
|---|---|---|
| committer | Dan Davison <ddavison@gitlab.com> | 2019-01-31 19:07:14 +0000 |
| commit | f38f646c85fb5d8c4bc982e1ac080f274fdb56d8 (patch) | |
| tree | 3cd0c023baa144fde9fdd481dbb80f5a40015228 /app/views/projects/wikis | |
| parent | b93c3112d035a0a843945d292006303d11621725 (diff) | |
| parent | 38fcb11f97d02af83cdc5d245e78a3f0d1b146f5 (diff) | |
| download | gitlab-ce-f38f646c85fb5d8c4bc982e1ac080f274fdb56d8.tar.gz | |
Merge branch 'qa-ml-fix-create-wiki-spec' into 'master'
Fix flaky wiki create test
Closes gitlab-org/quality/nightly#24
See merge request gitlab-org/gitlab-ce!24778
Diffstat (limited to 'app/views/projects/wikis')
| -rw-r--r-- | app/views/projects/wikis/_form.html.haml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml index 7d8826e540c..d1556dbd077 100644 --- a/app/views/projects/wikis/_form.html.haml +++ b/app/views/projects/wikis/_form.html.haml @@ -16,7 +16,7 @@ .form-group.row .col-sm-12= f.label :title, class: 'control-label-full-width' .col-sm-12 - = f.text_field :title, class: 'form-control', value: @page.title + = f.text_field :title, class: 'form-control qa-wiki-title-textbox', value: @page.title - if @page.persisted? %span.edit-wiki-page-slug-tip = icon('lightbulb-o') @@ -31,7 +31,7 @@ .col-sm-12= f.label :content, class: 'control-label-full-width' .col-sm-12 = render layout: 'projects/md_preview', locals: { url: project_wiki_preview_markdown_path(@project, @page.slug) } do - = render 'projects/zen', f: f, attr: :content, classes: 'note-textarea', placeholder: s_("WikiPage|Write your content or drag files here…") + = render 'projects/zen', f: f, attr: :content, classes: 'note-textarea qa-wiki-content-textarea', placeholder: s_("WikiPage|Write your content or drag files here…") = render 'shared/notes/hints' .clearfix @@ -47,14 +47,14 @@ .form-group.row .col-sm-12= f.label :commit_message, class: 'control-label-full-width' - .col-sm-12= f.text_field :message, class: 'form-control', rows: 18, value: commit_message + .col-sm-12= f.text_field :message, class: 'form-control qa-wiki-message-textbox', rows: 18, value: commit_message .form-actions - if @page && @page.persisted? - = f.submit _("Save changes"), class: 'btn-success btn' + = f.submit _("Save changes"), class: 'btn-success btn qa-save-changes-button' .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' + = f.submit s_("Wiki|Create page"), class: 'btn-success btn qa-create-page-button' .float-right = link_to _("Cancel"), project_wiki_path(@project, :home), class: 'btn btn-cancel' |