summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-01-24 10:59:33 +0000
committerPhil Hughes <me@iamphill.com>2017-01-26 16:04:34 +0000
commit4af91ea5cf4c0e5dbb2a432f293dee1f31fdb75a (patch)
treec19f120469a90a4d155b0aa2f8851169cb4fe95a
parentfadeefb688a4f98990df3849ef3fc8fa14dacf29 (diff)
downloadgitlab-ce-mr-widget-initial-state-tests.tar.gz
Added test for initial merge request widget statemr-widget-initial-state-tests
-rw-r--r--spec/features/merge_requests/widget_spec.rb34
1 files changed, 34 insertions, 0 deletions
diff --git a/spec/features/merge_requests/widget_spec.rb b/spec/features/merge_requests/widget_spec.rb
new file mode 100644
index 00000000000..7d1805f5001
--- /dev/null
+++ b/spec/features/merge_requests/widget_spec.rb
@@ -0,0 +1,34 @@
+require 'rails_helper'
+
+describe 'Merge request', :feature, :js do
+ include WaitForAjax
+
+ let(:project) { create(:project) }
+ let(:user) { create(:user) }
+
+ before do
+ project.team << [user, :master]
+ login_as(user)
+
+ visit new_namespace_project_merge_request_path(
+ project.namespace,
+ project,
+ merge_request: {
+ source_project_id: project.id,
+ target_project_id: project.id,
+ source_branch: 'feature',
+ target_branch: 'master'
+ }
+ )
+ end
+
+ it 'shows widget status after creating new merge request' do
+ click_button 'Submit merge request'
+
+ expect(find('.mr-state-widget')).to have_content('Checking ability to merge automatically')
+
+ wait_for_ajax
+
+ expect(page).to have_selector('.accept_merge_request')
+ end
+end