before switch to ubuntu commit since apple has issues

spec/support/ember_helpers.rb

@@ -101,4 +101,16 @@ module SpecEmberHelpers
   def faye_log
     JSON.parse(page.evaluate_script(%|JSON.stringify(window.faye_log)|))
   end
+
+  def when_ember_is_ready(&blk)
+    times = 0
+    ember_ready = page.evaluate_script('window.ember_ready')
+    while not ember_ready or times < 30
+      sleep 0.1
+      ember_ready = page.evaluate_script('window.ember_ready')
+      times += 1
+    end
+    raise "Ember is not loaded and should be" unless ember_ready
+    blk.call
+  end
 end

spec/support/route_helpers.rb

@@ -18,9 +18,11 @@ module SpecRouteHelpers
     max_wait = 4
     time = 0.0
     time_step = 0.25
-    while time < max_wait && ember_route != route_def
+    current_route = ember_route
+    while time < max_wait && current_route != route_def
       time += time_step
       sleep time_step
+      current_route = ember_route
     end
     ember_route(omit_should_raise: true).should == route_def
   end