summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArinde Eniola <eniolaarinde1@gmail.com>2016-04-07 23:44:59 +0100
committerArinde Eniola <eniolaarinde1@gmail.com>2016-04-07 23:44:59 +0100
commit400a1ae04d28388e7dfbd7c03db857d58a7d8776 (patch)
tree63283d50f1718bd370836233aac2d5ea112ad144
parent451314df964455577e08f653cc17d70fedf3f49b (diff)
downloadgitlab-ce-fix_quick_submit_missing_in_edit_merge_request.tar.gz
-rw-r--r--spec/features/merge_requests/edit_mr_spec.rb16
1 files changed, 5 insertions, 11 deletions
diff --git a/spec/features/merge_requests/edit_mr_spec.rb b/spec/features/merge_requests/edit_mr_spec.rb
index 27f7bca2af0..9e007ab7635 100644
--- a/spec/features/merge_requests/edit_mr_spec.rb
+++ b/spec/features/merge_requests/edit_mr_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-feature 'Create New Merge Request', feature: true do
+feature 'Edit Merge Request', feature: true do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:merge_request) { create(:merge_request, :with_diffs, source_project: project) }
@@ -13,15 +13,9 @@ feature 'Create New Merge Request', feature: true do
visit edit_namespace_project_merge_request_path(project.namespace, project, merge_request)
end
- context 'editing a MR', js: true do
- it 'should be able submit with quick_submit' do
- fill_in "merge_request_title", with: "Orphaned MR test"
-
- keypress = "var e = $.Event('keydown', { keyCode: 13, ctrlKey: true }); $('.merge-request-form').trigger(e);"
- page.driver.execute_script(keypress)
- sleep 2
-
- expect(find('h2.title')).to have_text('Orphaned MR test')
+ context 'editing a MR' do
+ it 'form should have class js-quick-submit' do
+ expect(page).to have_selector('.js-quick-submit')
end
end
-end \ No newline at end of file
+end