From ebb5f170583ea1ad66b9b5d996eff20ce9132bc9 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 15 May 2013 18:46:38 +0200
Subject: [PATCH] Fix tests with new Ember version

---
 assets/scripts/app/app.coffee          | 4 +---
 assets/scripts/spec/build_spec.coffee  | 1 +
 assets/scripts/spec/spec_helper.coffee | 5 ++---
 public/spec.html                       | 8 ++++++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/assets/scripts/app/app.coffee b/assets/scripts/app/app.coffee
index bf6207bd..998b0b2c 100644
--- a/assets/scripts/app/app.coffee
+++ b/assets/scripts/app/app.coffee
@@ -17,10 +17,8 @@ unless window.TravisApplication
       @set('auth', Travis.Auth.create(app: this, endpoint: Travis.config.api_endpoint))
 
     reset: ->
-      @store.destroy()
-      @setup()
-
       @_super.apply(this, arguments);
+      @setup()
 
     lookup: ->
       @__container__.lookup.apply @__container__, arguments
diff --git a/assets/scripts/spec/build_spec.coffee b/assets/scripts/spec/build_spec.coffee
index 5706ca74..4342294e 100644
--- a/assets/scripts/spec/build_spec.coffee
+++ b/assets/scripts/spec/build_spec.coffee
@@ -78,6 +78,7 @@ describe 'on the "current" state', ->
     Em.run ->
       Travis.receive 'build:started', payload
 
+    waits 10
     runs ->
       displaysSummaryBuildLink '/travis-ci/travis-core/builds/11', '3'
 
diff --git a/assets/scripts/spec/spec_helper.coffee b/assets/scripts/spec/spec_helper.coffee
index 540a4214..c75b7dcc 100644
--- a/assets/scripts/spec/spec_helper.coffee
+++ b/assets/scripts/spec/spec_helper.coffee
@@ -12,18 +12,17 @@ minispade.require 'app'
     token: 'abcdef'
 
 @app = (url, options = {}) ->
-  Travis.auth.signOut()
   # TODO: this should wait till app is initialized, not some
   #       arbitrary amount of time
   waits(50)
   runs ->
     Travis.reset()
+    Travis.auth.signOut()
 
     if options.user
       signInUser()
     url = "/#{url}" unless url.match /^\//
-    Travis.__container__.lookup('router:main').handleURL(url)
-
+    visit(url)
 
 now = -> new Date('2012-07-02T00:03:00Z')
 $.timeago.settings.nowFunction = -> now().getTime()
diff --git a/public/spec.html b/public/spec.html
index 0b9dbe8d..629eb83d 100644
--- a/public/spec.html
+++ b/public/spec.html
@@ -47,8 +47,12 @@
     <script src="/scripts/app.js"></script>
     <script>
       window.testMode = true;
-      minispade.require('travis')
-      Travis.advanceReadiness()
+      minispade.require('travis');
+      Ember.run(function(){
+        Travis.setupForTesting();
+        Travis.injectTestHelpers()
+        Travis.advanceReadiness();
+      });
     </script>
 
     <script src="/scripts/specs.js"></script>