Fix supplier poltergeist switch for waiting for app

spec/spec_helper.rb

@@ -10,7 +10,7 @@ require 'turnip/capybara'
 require 'in_memory_q_counter'
 require 'capybara-screenshot/rspec'
 require 'webmock/rspec'
-#require 'capybara/poltergeist'
+require 'capybara/poltergeist'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -21,8 +21,8 @@ Dir.glob("spec/acceptance_steps/**/*steps.rb") { |f| load f, true }
 I18n.locale =I18n.default_locale
 Devise.stretches = 1
 #Capybara.javascript_driver = :webkit
-#Capybara.javascript_driver = :poltergeist
-Capybara.javascript_driver = :selenium
+Capybara.javascript_driver = :poltergeist
+#Capybara.javascript_driver = :selenium
 Capybara.default_max_wait_time = 5 # ember needs more time than the default of 2
 Capybara.server_port = 62625
 Capybara::Screenshot.webkit_options = { width: 1024, height: 768 }

spec/support/ember_helpers.rb

@@ -104,7 +104,7 @@ module SpecEmberHelpers
   def when_ember_is_ready(&blk)
     times = 0
     ember_ready = page.evaluate_script('window.ember_ready')
-    while not ember_ready or times < 30
+    while not ember_ready and times < 30
       sleep 0.1
       ember_ready = page.evaluate_script('window.ember_ready')
       times += 1

spec/support/features/basic_helpers.rb

@@ -42,5 +42,27 @@ module Features
     def submit_form
       find("[type=submit]").click
     end
+
+    def screenshot
+      screenshot_and_open_image
+    end
+
+    def open_page
+      save_and_open_page
+    end
+
+    def visit(*args)
+      case args[0]
+      when SimplyStored::Couch, Array, Class
+        args[0] = polymorphic_path(args[0])
+      end
+      super(*args)
+      if Capybara.current_driver == Capybara.javascript_driver
+        if page.current_path != "/admin/employees/test_login"
+          when_ember_is_ready { }
+        end
+      end
+    end
+
   end
 end