Merge pull request #3803 from akostadinov/master

disable search by default in cucumbers and enable with @search annotation

features/support/sphinx.rb

@@ -1,23 +1,22 @@
 require 'thinking_sphinx'
 require 'thinking_sphinx/test'
 
-Before "not @search" do
+BeforeAll do
   ::ThinkingSphinx::Test.disable_search_jobs!
 end
 
-Before('@search') do
+Before '@search' do
   Sidekiq::Job.clear_all
   ::ThinkingSphinx::Test.stop
   ::ThinkingSphinx::Test.clear
   ::ThinkingSphinx::Test.init
   $searchd_autostop_installed ||= ::ThinkingSphinx::Test.autostop
   ::ThinkingSphinx::Test.wait_start
+
+  ::ThinkingSphinx::Test.enable_search_jobs!
 end
 
 After '@search' do
+  ::ThinkingSphinx::Test.disable_search_jobs!
   ::ThinkingSphinx::Test.stop
 end
-
-After "not @search" do
-  ::ThinkingSphinx::Test.enable_search_jobs!
-end