From 6c89ac3675e47aec07603405375532fe4ba713db Mon Sep 17 00:00:00 2001
From: Oliver Ponder <oliver.ponder@gmail.com>
Date: Tue, 12 Mar 2013 01:26:58 +0100
Subject: [PATCH] Make sure the app connects to the test faye when it is in the
 test environment

---
 .../broadcasters/{faye.js.coffee => faye.js.coffee.erb}     | 6 ++++++
 lib/broadcasters/faye.rb                                    | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 rename app/assets/javascripts/backbone/broadcasters/{faye.js.coffee => faye.js.coffee.erb} (91%)

diff --git a/app/assets/javascripts/backbone/broadcasters/faye.js.coffee b/app/assets/javascripts/backbone/broadcasters/faye.js.coffee.erb
similarity index 91%
rename from app/assets/javascripts/backbone/broadcasters/faye.js.coffee
rename to app/assets/javascripts/backbone/broadcasters/faye.js.coffee.erb
index 234c575e..59cfe625 100644
--- a/app/assets/javascripts/backbone/broadcasters/faye.js.coffee
+++ b/app/assets/javascripts/backbone/broadcasters/faye.js.coffee.erb
@@ -1,7 +1,13 @@
 class Kandan.Broadcasters.FayeBroadcaster
 
   constructor: ()->
+    <% if Rails.env == "test" %>
+    @fayeClient = new Faye.Client("http://localhost:9292/remote/faye")
+    @fayeClient.setHeader('Access-Control-Allow-Origin', '*');
+    <% else %>
     @fayeClient = new Faye.Client("/remote/faye")
+    <% end %>
+
     @fayeClient.disable('websocket')
     authExtension = {
       outgoing: (message, callback)->
diff --git a/lib/broadcasters/faye.rb b/lib/broadcasters/faye.rb
index a58e0342..a490075f 100644
--- a/lib/broadcasters/faye.rb
+++ b/lib/broadcasters/faye.rb
@@ -13,7 +13,11 @@ def broadcast(channel, message)
       end
 
       def assets
-        ["/remote/faye.js"]
+        if Rails.env == "test"
+          ["http://localhost:9292/remote/faye.js"]
+        else
+          ['remote/faye']
+        end
       end
     end
   end