Merge branch 'fix-hash-syntax-for-boards' into 'master'

Use Ruby 2.1-compatible hash syntax for boards

This broke the master build, because we only run Ruby 2.1 specs on master. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6978 wouldn't help because this is in Haml 😞

See merge request !808

app/views/projects/boards/_title.html.haml

@@ -51,11 +51,11 @@
       .dropdown-footer{ "v-if" => "currentPage === ''" }
         %ul.dropdown-footer-list
           %li
-            %a{ "href": "#", "@click.stop.prevent" => "showPage('new')" }
+            %a{ "href" => "#", "@click.stop.prevent" => "showPage('new')" }
               Create new board
           %li
-            %a{ "href": "#", "@click.stop.prevent" => "showPage('edit')" }
+            %a{ "href" => "#", "@click.stop.prevent" => "showPage('edit')" }
               Edit board name
           %li{ "v-if" => "showDelete" }
-            %a.text-danger{ "href": "#", "@click.stop.prevent" => "showPage('delete')" }
+            %a.text-danger{ "href" => "#", "@click.stop.prevent" => "showPage('delete')" }
               Delete board

features/steps/project/merge_requests.rb

@@ -9,6 +9,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   include SharedUser
   include WaitForAjax
 
+  after do
+    wait_for_ajax if javascript_test?
+  end
+
   step 'I click link "New Merge Request"' do
     click_link "New Merge Request"
   end

features/steps/shared/note.rb

-require Rails.root.join('features/support/wait_for_ajax')
-
 module SharedNote
   include Spinach::DSL
   include WaitForAjax

features/support/env.rb

@@ -15,7 +15,7 @@ if ENV['CI']
   Knapsack::Adapters::SpinachAdapter.bind
 end
 
-%w(select2_helper test_env repo_helpers license).each do |f|
+%w(select2_helper test_env repo_helpers license wait_for_ajax).each do |f|
   require Rails.root.join('spec', 'support', f)
 end
 

features/support/wait_for_ajax.rb

-module WaitForAjax
-  def wait_for_ajax
-    Timeout.timeout(Capybara.default_max_wait_time) do
-      loop until finished_all_ajax_requests?
-    end
-  end
-
-  def finished_all_ajax_requests?
-    page.evaluate_script('jQuery.active').zero?
-  end
-end

spec/support/wait_for_ajax.rb

@@ -8,4 +8,8 @@ module WaitForAjax
   def finished_all_ajax_requests?
     page.evaluate_script('jQuery.active').zero?
   end
+
+  def javascript_test?
+    [:selenium, :webkit, :chrome, :poltergeist].include?(Capybara.current_driver)
+  end
 end