Merge branch 'master' into 34102-online-view-of-artifacts-fe

3 files changed, 49 insertions, 25 deletions

diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb
index d2789d0aa52..1f9b52dd998 100644
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
@@ -3,6 +3,7 @@ require 'spec_helper'
 feature 'issuable templates', js: true do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public, :repository) }
+  let(:issue_form_location) { '#content-body .issuable-details .detail-page-description' }
 
   before do
     project.team << [user, :master]
@@ -28,14 +29,17 @@ feature 'issuable templates', js: true do
         longtemplate_content,
         message: 'added issue template',
         branch_name: 'master')
-      visit edit_project_issue_path project, issue
-      fill_in :'issue[title]', with: 'test issue title'
+      visit project_issue_path project, issue
+      page.within('.content .issuable-actions') do
+        click_on 'Edit'
+      end
+      fill_in :'issue-title', with: 'test issue title'
     end
 
     scenario 'user selects "bug" template' do
       select_template 'bug'
       wait_for_requests
-      assert_template
+      assert_template(page_part: issue_form_location)
       save_changes
     end
 
@@ -43,30 +47,19 @@ feature 'issuable templates', js: true do
       select_template 'bug'
       wait_for_requests
       select_option 'No template'
-      assert_template('')
+      assert_template(expected_content: '', page_part: issue_form_location)
       save_changes('')
     end
 
     scenario 'user selects "bug" template, edits description and then selects "reset template"' do
       select_template 'bug'
       wait_for_requests
-      find_field('issue_description').send_keys(description_addition)
-      assert_template(template_content + description_addition)
+      find_field('issue-description').send_keys(description_addition)
+      assert_template(expected_content: template_content + description_addition, page_part: issue_form_location)
       select_option 'Reset template'
-      assert_template
+      assert_template(page_part: issue_form_location)
       save_changes
     end
-
-    it 'updates height of markdown textarea' do
-      start_height = page.evaluate_script('$(".markdown-area").outerHeight()')
-
-      select_template 'test'
-      wait_for_requests
-
-      end_height = page.evaluate_script('$(".markdown-area").outerHeight()')
-
-      expect(end_height).not_to eq(start_height)
-    end
   end
 
   context 'user creates an issue using templates, with a prior description' do
@@ -81,15 +74,18 @@ feature 'issuable templates', js: true do
         template_content,
         message: 'added issue template',
         branch_name: 'master')
-      visit edit_project_issue_path project, issue
-      fill_in :'issue[title]', with: 'test issue title'
-      fill_in :'issue[description]', with: prior_description
+      visit project_issue_path project, issue
+      page.within('.content .issuable-actions') do
+        click_on 'Edit'
+      end
+      fill_in :'issue-title', with: 'test issue title'
+      fill_in :'issue-description', with: prior_description
     end
 
     scenario 'user selects "bug" template' do
       select_template 'bug'
       wait_for_requests
-      assert_template("#{template_content}")
+      assert_template(page_part: issue_form_location)
       save_changes
     end
   end
@@ -154,8 +150,10 @@ feature 'issuable templates', js: true do
     end
   end
 
-  def assert_template(expected_content = template_content)
-    expect(find('textarea')['value']).to eq(expected_content)
+  def assert_template(expected_content: template_content, page_part: '#content-body')
+    page.within(page_part) do
+      expect(find('textarea')['value']).to eq(expected_content)
+    end
   end
 
   def save_changes(expected_content = template_content)
diff --git a/spec/features/projects/project_settings_spec.rb b/spec/features/projects/project_settings_spec.rb
index 5d77cd1ccd5..06568817757 100644
--- a/spec/features/projects/project_settings_spec.rb
+++ b/spec/features/projects/project_settings_spec.rb
@@ -32,6 +32,32 @@ describe 'Edit Project Settings' do
     end
   end
 
+  describe 'Merge request settings section' do
+    it 'shows "Merge commit" strategy' do
+      visit edit_project_path(project)
+
+      page.within '.merge-requests-feature' do
+        expect(page).to have_content 'Merge commit'
+      end
+    end
+
+    it 'shows "Merge commit with semi-linear history " strategy' do
+      visit edit_project_path(project)
+
+      page.within '.merge-requests-feature' do
+        expect(page).to have_content 'Merge commit with semi-linear history'
+      end
+    end
+
+    it 'shows "Fast-forward merge" strategy' do
+      visit edit_project_path(project)
+
+      page.within '.merge-requests-feature' do
+        expect(page).to have_content 'Fast-forward merge'
+      end
+    end
+  end
+
   describe 'Rename repository section' do
     context 'with invalid characters' do
       it 'shows errors for invalid project path/name' do
diff --git a/spec/features/projects/wiki/user_views_wiki_page_spec.rb b/spec/features/projects/wiki/user_views_wiki_page_spec.rb
index 49ba2969ef0..470391dc66b 100644
--- a/spec/features/projects/wiki/user_views_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_views_wiki_page_spec.rb
@@ -83,7 +83,7 @@ describe 'User views a wiki page' do
     it 'shows a file stored in a page' do
       file = Gollum::File.new(project.wiki)
 
-      allow_any_instance_of(Gollum::Wiki).to receive(:file).with('image.jpg', 'master', true).and_return(file)
+      allow_any_instance_of(Gollum::Wiki).to receive(:file).with('image.jpg', 'master').and_return(file)
       allow_any_instance_of(Gollum::File).to receive(:mime_type).and_return('image/jpeg')
 
       expect(page).to have_xpath('//img[@data-src="image.jpg"]')