3 files changed, 9 insertions, 11 deletions
diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index 35b71599708..11fa85ed2fe 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -1,6 +1,11 @@
 module SharedDiffNote
   include Spinach::DSL
   include RepoHelpers
+  include WaitForAjax
+
+  after do
+    wait_for_ajax if javascript_test?
+  end
 
   step 'I cancel the diff comment' do
     page.within(diff_file_selector) do
diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb
index 9dc1fc41b3b..1870f6bc0c3 100644
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -2,6 +2,10 @@ module SharedNote
   include Spinach::DSL
   include WaitForAjax
 
+  after do
+    wait_for_ajax if javascript_test?
+  end
+
   step 'I delete a comment' do
     page.within('.main-notes-list') do
       find('.note').hover
diff --git a/features/steps/shared/search.rb b/features/steps/shared/search.rb
deleted file mode 100644
index 6c3d601763d..00000000000
--- a/features/steps/shared/search.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module SharedSearch
-  include Spinach::DSL
-
-  def search_snippet_contents(query)
-    visit "/search?search=#{URI::encode(query)}&snippets=true&scope=snippet_blobs"
-  end
-
-  def search_snippet_titles(query)
-    visit "/search?search=#{URI::encode(query)}&snippets=true&scope=snippet_titles"
-  end
-end