Make sure the app connects to the test faye when it is in the test en…

…vironment
kandanapp · Mar 12, 2013 · 6c89ac3 · 6c89ac3
1 parent 8c0ba3e
commit 6c89ac3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...ipts/backbone/broadcasters/faye.js.coffee → .../backbone/broadcasters/faye.js.coffee.erb b/...ipts/backbone/broadcasters/faye.js.coffee → .../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
@@ -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