1 files changed, 8 insertions, 8 deletions
diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb
index 62d0aedda48..fa5e30075e3 100644
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'issuable templates', feature: true, js: true do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
 
@@ -14,7 +12,7 @@ feature 'issuable templates', feature: true, js: true do
   context 'user creates an issue using templates' do
     let(:template_content) { 'this is a test "bug" template' }
     let(:longtemplate_content) { %Q(this\n\n\n\n\nis\n\n\n\n\na\n\n\n\n\nbug\n\n\n\n\ntemplate) }
-    let(:issue) { create(:issue, author: user, assignee: user, project: project) }
+    let(:issue) { create(:issue, author: user, assignees: [user], project: project) }
     let(:description_addition) { ' appending to description' }
 
     background do
@@ -74,7 +72,7 @@ feature 'issuable templates', feature: true, js: true do
   context 'user creates an issue using templates, with a prior description' do
     let(:prior_description) { 'test issue description' }
     let(:template_content) { 'this is a test "bug" template' }
-    let(:issue) { create(:issue, author: user, assignee: user, project: project) }
+    let(:issue) { create(:issue, author: user, assignees: [user], project: project) }
 
     background do
       project.repository.create_file(
@@ -163,12 +161,14 @@ feature 'issuable templates', feature: true, js: true do
   end
 
   def select_template(name)
-    first('.js-issuable-selector').click
-    first('.js-issuable-selector-wrap .dropdown-content a', text: name).click
+    find('.js-issuable-selector').click
+
+    find('.js-issuable-selector-wrap .dropdown-content a', text: name, match: :first).click
   end
 
   def select_option(name)
-    first('.js-issuable-selector').click
-    first('.js-issuable-selector-wrap .dropdown-footer-list a', text: name).click
+    find('.js-issuable-selector').click
+
+    find('.js-issuable-selector-wrap .dropdown-footer-list a', text: name, match: :first).click
   end
 end