Skip to content

Commit

Permalink
Don't proxy browserchannel.
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Scholtes authored and dignifiedquire committed Oct 15, 2013
1 parent eb00959 commit 9a5a9df
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 19 deletions.
6 changes: 0 additions & 6 deletions karma.conf.coffee
Expand Up @@ -29,9 +29,3 @@ module.exports = (config) ->

# Browsers
browsers: if process.env.TRAVIS then ['Firefox'] else ['Chrome']

# Configure Proxies
proxies:
'/channel': 'http://localhost:3000/channel'
'/fixtures': 'http://localhost:3000/fixtures'

8 changes: 4 additions & 4 deletions test/browser/connection.coffee
@@ -1,4 +1,5 @@
assert = require 'assert'
createSocket = require '../helpers/socket.coffee'


describe 'Connection', ->
Expand All @@ -7,11 +8,10 @@ describe 'Connection', ->

share = require('../../lib/client')
Connection = share.Connection
{BCSocket} = require('browserchannel/dist/bcsocket')

describe 'connecting', ->
it 'connects socket', (done)->
socket = new BCSocket
socket = createSocket()
socket.close()
connection = new Connection(socket)
connection.on 'connecting', ->
Expand All @@ -20,7 +20,7 @@ describe 'Connection', ->
socket.open()

it 'connects to sharejs', (done)->
socket = new BCSocket
socket = createSocket()
connection = new Connection(socket)
connection.on 'connected', ->
socket.close()
Expand All @@ -30,7 +30,7 @@ describe 'Connection', ->
describe '#get', ->

before ->
socket = new BCSocket
socket = createSocket()
@connection = new Connection(socket)

after ->
Expand Down
6 changes: 3 additions & 3 deletions test/browser/doc.coffee
@@ -1,19 +1,19 @@
assert = require 'assert'
ottypes = require 'ottypes'
sinon = require 'sinon'
createSocket = require '../helpers/socket.coffee'

describe 'Doc', ->
# Disable Timeouts becaue the connection can take ages. Not sure why
@timeout(0)

{Connection} = require('../../lib/client')
{BCSocket} = require('browserchannel/dist/bcsocket')

fixtures = require('../helpers/fixtures.coffee')()

before ->
@connection = @alice = new Connection(new BCSocket)
@bob = new Connection(new BCSocket)
@connection = @alice = new Connection(createSocket())
@bob = new Connection(createSocket())

@alice.on 'error', (e)-> throw e
@bob.on 'error', (e)-> throw e
Expand Down
7 changes: 4 additions & 3 deletions test/browser/subscribed.coffee
@@ -1,7 +1,8 @@
createSocket = require '../helpers/socket.coffee'

describe 'Subscribed Document', ->
assert = require 'assert'
{Connection} = require '../../lib/client'
{BCSocket} = require 'browserchannel/dist/bcsocket'
require '../../lib/types'
ottypes = require 'ottypes'

Expand All @@ -11,8 +12,8 @@ describe 'Subscribed Document', ->
connections = {}

before ->
connections.alice = new Connection(new BCSocket)
connections.bob = new Connection(new BCSocket)
connections.alice = new Connection(createSocket())
connections.bob = new Connection(createSocket())

after ->
for name, connection of connections
Expand Down
2 changes: 1 addition & 1 deletion test/helpers/fixtures.coffee
Expand Up @@ -6,7 +6,7 @@
# fix.reset -> 'fixtures reseted'
#
module.exports = ->
socket: (new BCSocket 'fixtures')
socket: (new BCSocket 'http://localhost:3000/fixtures')
reset: (done)->
@socket.onmessage = =>
@socket.onmessage = undefined
Expand Down
6 changes: 4 additions & 2 deletions test/helpers/server.coffee
Expand Up @@ -53,11 +53,13 @@ module.exports = (options = {})->
share = createInstance()

# BrowserChannel middleware that creates sharejs sessions
shareChannel = require('browserchannel').server (socket)->
shareChannel = require('browserchannel')
.server cors: '*', (socket)->
share.listen socketToStream(socket, log)

# Enables client to reset the database
fixturesChannel = require('browserchannel').server base: '/fixtures', (socket)->
fixturesChannel = require('browserchannel')
.server base: '/fixtures', cors: '*', (socket)->
socket.on 'message', (data)->
share.backend.redis.flushdb()
share.backend.db.collections = {}
Expand Down
4 changes: 4 additions & 0 deletions test/helpers/socket.coffee
@@ -0,0 +1,4 @@
{BCSocket} = require('browserchannel/dist/bcsocket')

module.exports = (url = 'http://localhost:3000/channel')->
new BCSocket(url)

0 comments on commit 9a5a9df

Please sign in to comment.