From 476a8049691951c4e1259cdbb164bbf1fca2bd1e Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Tue, 23 Feb 2016 19:37:15 -0600 Subject: [PATCH] Update award_emoji test --- app/controllers/emojis_controller.rb | 3 ++- features/steps/project/issues/award_emoji.rb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/emojis_controller.rb b/app/controllers/emojis_controller.rb index 693e2cc48229..1bec5a7d27ff 100644 --- a/app/controllers/emojis_controller.rb +++ b/app/controllers/emojis_controller.rb @@ -1,5 +1,6 @@ class EmojisController < ApplicationController + layout false + def index - render :index, layout: false end end diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb index ff9677ba972f..277c63914d12 100644 --- a/features/steps/project/issues/award_emoji.rb +++ b/features/steps/project/issues/award_emoji.rb @@ -96,7 +96,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps end step 'The search field is focused' do - sleep 0.8 - page.evaluate_script("document.activeElement.id").should eq "emoji_search" + expect(page).to have_selector('#emoji_search') + expect(page.evaluate_script('document.activeElement.id')).to eq('emoji_search') end end