chai-backbone-rails 0.2.0 → 0.2.1

data/README.md

@@ -39,12 +39,19 @@ this can also be chained further:
     "page/3".should.route.to myRouter, "openPage", arguments: ["3"]
     "page/3".should.route.to myRouter, "openPage", considering: [conflictingRouter]
 
-### Changes
+Using Changes Chai matchers
+---------------------------
+
+    #= require chai-changes
+
+Plain change checking:
+
+    expect(-> result).to.change.when -> result += 1
+    expect(-> result).to.not.change.when -> somethingElse()
 
 Changes by delta: 'change.by'
 
     expect(-> view.$('p').length).to.change.by(4).when -> collection.add [{}, {}, {}, {}]
-    expect(-> result).to.not.change.when -> somethingElse()
 
 Changes to end result: 'change.to'
 
@@ -129,6 +136,20 @@ You can also yield results:
     Factory.create('abc') => 'a'
     Factory.create('abc') => 'b'
 
+Running the tests
+=================
+
+You can runn the tests by including:
+
+    #= require chai-backbone_spec
+
+or you can run the suites seperately:
+
+    #= require spec/chai-backbone_spec
+    #= require spec/chai-sinon_spec
+    #= require spec/chai-changes_spec
+    #= require spec/factory_spec
+
 
 Contributing
 ------------

data/lib/chai-backbone-rails/version.rb

@@ -1,7 +1,7 @@
 module Chai
   module Backbone
     module Rails
-      VERSION = "0.2.0"
+      VERSION = "0.2.1"
     end
   end
 end

data/vendor/assets/javascripts/chai-backbone.js.coffee

@@ -1,4 +1,5 @@
 #= require underscore
+#= require ./chai-changes
 
 ((chaiBackbone) ->
   # Module systems magic dance.
@@ -50,13 +51,6 @@
         flag(context, 'negate', negate)
     flag(this, 'whenActions', definedActions)
 
-  chai.Assertion.addMethod 'when', (val) ->
-    definedActions = flag(this, 'whenActions') || []
-
-    action.before?(this) for action in definedActions
-    val() # execute the 'when'
-    action.after?(this) for action in definedActions
-
   # Verify if a url fragment is routed to a certain method on the router
   # Options:
   # - you can consider multiple routers to test routing priorities
@@ -113,168 +107,12 @@
         "expected `#{methodName}` to be called with #{inspect options.arguments}, but was called with #{inspect spy.args[0]} instead",
         "expected `#{methodName}` not to be called with #{inspect options.arguments}, but was"
 
-  chai.Assertion.addChainableMethod 'to', routeTo, -> this
-
-
-  ###
-  #
-  # Changes Matchers
-  #
-  ###
-
-  noChangeAssert = (context) ->
-    relevant = flag(context, 'no-change')
-    return unless relevant
-
-    negate = flag(context, 'negate')
-    flag(context, 'negate', @negate)
-    object = flag(context, 'object')
-
-    startValue = flag(context, 'changeStart')
-    endValue = object()
-    actualDelta = endValue - startValue
-
-    result = (0 is actualDelta)
-    result = !result if negate
-    context.assert result,
-      "not supported"
-      "expected `#{formatFunction object}` not to change, but it changed by #{actualDelta}",
-    flag(context, 'negate', negate)
-
-  changeByAssert = (context) ->
-    negate = flag(context, 'negate')
-    flag(context, 'negate', @negate)
-    object = flag(context, 'object')
-
-    startValue = flag(context, 'changeStart')
-    endValue = object()
-    actualDelta = endValue - startValue
-
-    result = (@expectedDelta is actualDelta)
-    result = !result if negate
-    context.assert result,
-      "expected `#{formatFunction object}` to change by #{@expectedDelta}, but it changed by #{actualDelta}",
-      "not supported"
-    flag(context, 'negate', negate)
-
-  changeToBeginAssert = (context) ->
-    negate = flag(context, 'negate')
-    flag(context, 'negate', @negate)
-    object = flag(context, 'object')
-
-    startValue = object()
-
-    result = !utils.eql(startValue, @expectedEndValue)
-    result = !result if negate
-    context.assert result,
-      "expected `#{formatFunction object}` to change to #{utils.inspect @expectedEndValue}, but it was already #{utils.inspect startValue}",
-      "not supported"
-    flag(context, 'negate', negate)
-
-  changeToAssert = (context) ->
-    negate = flag(context, 'negate')
-    flag(context, 'negate', @negate)
-    object = flag(context, 'object')
-
-    endValue = object()
-
-    result = utils.eql(endValue, @expectedEndValue)
-    result = !result if negate
-    context.assert result,
-      "expected `#{formatFunction object}` to change to #{utils.inspect @expectedEndValue}, but it changed to #{utils.inspect endValue}",
-      "not supported"
-    flag(context, 'negate', negate)
-
-  changeFromBeginAssert = (context) ->
-    negate = flag(context, 'negate')
-    flag(context, 'negate', @negate)
-    object = flag(context, 'object')
-
-    startValue = object()
-
-    result = utils.eql(startValue, @expectedStartValue)
-    result = !result if negate
-    context.assert result,
-      "expected `#{formatFunction object}` to change from #{utils.inspect @expectedStartValue}, but it changed from #{utils.inspect startValue}",
-      "not supported"
-    flag(context, 'negate', negate)
-
-  changeFromAssert = (context) ->
-    negate = flag(context, 'negate')
-    flag(context, 'negate', @negate)
-    object = flag(context, 'object')
-
-    startValue = flag(context, 'changeStart')
-    endValue = object()
-
-    result = !utils.eql(startValue, endValue)
-    result = !result if negate
-    context.assert result,
-      "expected `#{formatFunction object}` to change from #{utils.inspect @expectedStartValue}, but it did not change"
-      "not supported"
-    flag(context, 'negate', negate)
-
-  # Verifies if the subject return value changes by given delta 'when' events happen
-  #
-  # Examples:
-  #   (-> resultValue).should.change.by(1).when -> resultValue += 1
-  #
-  chai.Assertion.addProperty 'change', ->
-    flag(this, 'no-change', true)
-
-    definedActions = flag(this, 'whenActions') || []
-    # Add a around filter to the when actions
-    definedActions.push
-      negate: flag(this, 'negate')
-
-      # set up the callback to trigger
-      before: (context) ->
-        startValue = flag(context, 'object')()
-        flag(context, 'changeStart', startValue)
-      after: noChangeAssert
-
-    flag(this, 'whenActions', definedActions)
-
-  formatFunction = (func) ->
-    func.toString().replace(/^\s*function \(\) {\s*/, '').replace(/\s+}$/, '').replace(/\s*return\s*/, '')
-
-  changeBy = (delta) ->
-    flag(this, 'no-change', false)
-    definedActions = flag(this, 'whenActions') || []
-    # Add a around filter to the when actions
-    definedActions.push
-      negate: flag(this, 'negate')
-      expectedDelta: delta
-      after: changeByAssert
-    flag(this, 'whenActions', definedActions)
-
-  chai.Assertion.addChainableMethod 'by', changeBy, -> this
-
-  changeTo = (endValue) ->
-    flag(this, 'no-change', false)
-    definedActions = flag(this, 'whenActions') || []
-    # Add a around filter to the when actions
-    definedActions.push
-      negate: flag(this, 'negate')
-      expectedEndValue: endValue
-      before: changeToBeginAssert
-      after: changeToAssert
-    flag(this, 'whenActions', definedActions)
-
-  chai.Assertion.addChainableMethod 'to', changeTo, -> this
-
-  changeFrom = (startValue) ->
-    flag(this, 'no-change', false)
-    definedActions = flag(this, 'whenActions') || []
-    # Add a around filter to the when actions
-    definedActions.push
-      negate: flag(this, 'negate')
-      expectedStartValue: startValue
-      before: changeFromBeginAssert
-      after: changeFromAssert
-    flag(this, 'whenActions', definedActions)
-
-  chai.Assertion.addChainableMethod 'from', changeFrom, -> this
+  chai.Assertion.overwriteProperty 'to', (_super) ->
+    ->
+      if flag(this, 'routing')
+        routeTo
+      else
+        _super.apply(this, arguments)
 
 )
 

data/vendor/assets/javascripts/chai-backbone_spec.js.coffee

@@ -1,6 +1,4 @@
-#= require ./chai-backbone
 #= require ./spec/chai-backbone_spec
-#= require ./chai-sinon
 #= require ./spec/chai-sinon_spec
-#= require ./factories
+#= require ./spec/chai-changes_spec
 #= require ./spec/factory_spec

data/vendor/assets/javascripts/chai-changes.js.coffee

@@ -0,0 +1,183 @@
+
+((chaiChanges) ->
+  # Module systems magic dance.
+  if (typeof require == "function" && typeof exports == "object" && typeof module == "object")
+    # NodeJS
+    module.exports = chaiChanges
+  else if (typeof define == "function" && define.amd)
+    # AMD
+    define -> chaiChanges
+  else
+    # Other environment (usually <script> tag): plug in to global chai instance directly.
+    chai.use chaiChanges
+)((chai, utils) ->
+  inspect = utils.inspect
+  flag = utils.flag
+
+  ###
+  #
+  # Changes Matchers
+  #
+  ###
+
+  chai.Assertion.addMethod 'when', (val) ->
+    definedActions = flag(this, 'whenActions') || []
+
+    action.before?(this) for action in definedActions
+    val() # execute the 'when'
+    action.after?(this) for action in definedActions
+
+  noChangeAssert = (context) ->
+    relevant = flag(context, 'no-change')
+    return unless relevant
+
+    negate = flag(context, 'negate')
+    flag(context, 'negate', @negate)
+    object = flag(context, 'object')
+
+    startValue = flag(context, 'changeStart')
+    endValue = object()
+
+    result = !utils.eql(endValue, startValue)
+    context.assert result,
+      "expected `#{formatFunction object}` to change, but it stayed #{utils.inspect startValue}",
+      "expected `#{formatFunction object}` not to change, but it changed from #{utils.inspect startValue} to #{utils.inspect endValue}",
+    flag(context, 'negate', negate)
+
+  changeByAssert = (context) ->
+    negate = flag(context, 'negate')
+    flag(context, 'negate', @negate)
+    object = flag(context, 'object')
+
+    startValue = flag(context, 'changeStart')
+    endValue = object()
+    actualDelta = endValue - startValue
+
+    result = (@expectedDelta is actualDelta)
+    result = !result if negate
+    context.assert result,
+      "expected `#{formatFunction object}` to change by #{@expectedDelta}, but it changed by #{actualDelta}",
+      "not supported"
+    flag(context, 'negate', negate)
+
+  changeToBeginAssert = (context) ->
+    negate = flag(context, 'negate')
+    flag(context, 'negate', @negate)
+    object = flag(context, 'object')
+
+    startValue = object()
+
+    result = !utils.eql(startValue, @expectedEndValue)
+    result = !result if negate
+    context.assert result,
+      "expected `#{formatFunction object}` to change to #{utils.inspect @expectedEndValue}, but it was already #{utils.inspect startValue}",
+      "not supported"
+    flag(context, 'negate', negate)
+
+  changeToAssert = (context) ->
+    negate = flag(context, 'negate')
+    flag(context, 'negate', @negate)
+    object = flag(context, 'object')
+
+    endValue = object()
+
+    result = utils.eql(endValue, @expectedEndValue)
+    result = !result if negate
+    context.assert result,
+      "expected `#{formatFunction object}` to change to #{utils.inspect @expectedEndValue}, but it changed to #{utils.inspect endValue}",
+      "not supported"
+    flag(context, 'negate', negate)
+
+  changeFromBeginAssert = (context) ->
+    negate = flag(context, 'negate')
+    flag(context, 'negate', @negate)
+    object = flag(context, 'object')
+
+    startValue = object()
+
+    result = utils.eql(startValue, @expectedStartValue)
+    result = !result if negate
+    context.assert result,
+      "expected `#{formatFunction object}` to change from #{utils.inspect @expectedStartValue}, but it changed from #{utils.inspect startValue}",
+      "not supported"
+    flag(context, 'negate', negate)
+
+  changeFromAssert = (context) ->
+    negate = flag(context, 'negate')
+    flag(context, 'negate', @negate)
+    object = flag(context, 'object')
+
+    startValue = flag(context, 'changeStart')
+    endValue = object()
+
+    result = !utils.eql(startValue, endValue)
+    result = !result if negate
+    context.assert result,
+      "expected `#{formatFunction object}` to change from #{utils.inspect @expectedStartValue}, but it did not change"
+      "not supported"
+    flag(context, 'negate', negate)
+
+  # Verifies if the subject return value changes by given delta 'when' events happen
+  #
+  # Examples:
+  #   (-> resultValue).should.change.by(1).when -> resultValue += 1
+  #
+  chai.Assertion.addProperty 'change', ->
+    flag(this, 'no-change', true)
+
+    definedActions = flag(this, 'whenActions') || []
+    # Add a around filter to the when actions
+    definedActions.push
+      negate: flag(this, 'negate')
+
+      # set up the callback to trigger
+      before: (context) ->
+        startValue = flag(context, 'object')()
+        flag(context, 'changeStart', startValue)
+      after: noChangeAssert
+
+    flag(this, 'whenActions', definedActions)
+
+  formatFunction = (func) ->
+    func.toString().replace(/^\s*function \(\) {\s*/, '').replace(/\s+}$/, '').replace(/\s*return\s*/, '')
+
+  changeBy = (delta) ->
+    flag(this, 'no-change', false)
+    definedActions = flag(this, 'whenActions') || []
+    # Add a around filter to the when actions
+    definedActions.push
+      negate: flag(this, 'negate')
+      expectedDelta: delta
+      after: changeByAssert
+    flag(this, 'whenActions', definedActions)
+
+  chai.Assertion.addChainableMethod 'by', changeBy, -> this
+
+  changeTo = (endValue) ->
+    flag(this, 'no-change', false)
+    definedActions = flag(this, 'whenActions') || []
+    # Add a around filter to the when actions
+    definedActions.push
+      negate: flag(this, 'negate')
+      expectedEndValue: endValue
+      before: changeToBeginAssert
+      after: changeToAssert
+    flag(this, 'whenActions', definedActions)
+
+  chai.Assertion.addChainableMethod 'to', changeTo, -> this
+
+  changeFrom = (startValue) ->
+    flag(this, 'no-change', false)
+    definedActions = flag(this, 'whenActions') || []
+    # Add a around filter to the when actions
+    definedActions.push
+      negate: flag(this, 'negate')
+      expectedStartValue: startValue
+      before: changeFromBeginAssert
+      after: changeFromAssert
+    flag(this, 'whenActions', definedActions)
+
+  chai.Assertion.addChainableMethod 'from', changeFrom, -> this
+
+)
+

data/vendor/assets/javascripts/spec/chai-backbone_spec.js.coffee

@@ -1,3 +1,4 @@
+#= require ./../chai-backbone
 
 describe 'Chai-Backbone', ->
 
@@ -35,73 +36,16 @@ describe 'Chai-Backbone', ->
 
     it 'checks if a method is trigger by route', ->
       "route1/sub".should.route.to router, 'subRoute'
+      expect(->
+        "route1/ere".should.route.to router, 'subRoute'
+      ).to.throw 'expected `route1/ere` to route to subRoute'
 
     it 'verifies argument parsing', ->
-      "route2/argVal".should.route.to router, 'routeWithArg', with: ['argVal']
+      "route2/argVal".should.route.to router, 'routeWithArg', arguments: ['argVal']
+      expect(->
+        "route2/ere".should.route.to router, 'routeWithArg', arguments: ['argVal']
+      ).to.throw 'expected `routeWithArg` to be called with [ \'argVal\' ], but was called with [ \'ere\' ] instead'
 
     it 'leaves the `to` keyword working properly', ->
       expect('1').to.be.equal '1'
 
-  describe 'change', ->
-
-    describe 'by delta', ->
-
-      it 'asserts the delta of a change', ->
-        result = 1
-        expect(-> result).to.change.by(3).when -> result += 3
-
-      it 'reports the contents of the subject method', ->
-        result = 1
-        expect(->
-          (-> 1 + 3; result).should.change.by(3).when -> result += 2
-        ).to.throw 'expected `1 + 3;result;` to change by 3, but it changed by 2'
-
-      it 'can be negated to not.change', ->
-        result = 1
-        expect(->
-          expect(-> result).to.not.change.when -> result += 2
-        ).to.throw 'expected `result;` not to change, but it changed by 2'
-        expect(-> result).to.not.change.when -> 1 + 3
-
-    describe 'to', ->
-
-      it 'asserts end values', ->
-        result = ['a']
-        expect(-> result).to.change.to(['b']).when -> result = ['b']
-
-      it 'reports the mismatched end value', ->
-        result = ['a']
-        expect(->
-          expect(-> result).to.change.to(['b']).when -> result = ['c']
-        ).to.throw 'expected `result;` to change to [ \'b\' ], but it changed to [ \'c\' ]'
-
-      it 'raises an error if there was no change', ->
-        result = 'b'
-        expect(->
-          expect(-> result).to.change.to('b').when -> result = 'b'
-        ).to.throw 'expected `result;` to change to \'b\', but it was already \'b\''
-
-    describe 'from', ->
-
-      it 'asserts start values', ->
-        result = ['a']
-        expect(-> result).to.change.from(['a']).when -> result = ['b']
-
-      it 'reports the mismatched start value', ->
-        result = ['a']
-        expect(->
-          expect(-> result).to.change.from(['b']).when -> result = ['c']
-        ).to.throw 'expected `result;` to change from [ \'b\' ], but it changed from [ \'a\' ]'
-
-      it 'raises an error if there was no change', ->
-        result = 'b'
-        expect(->
-          expect(-> result).to.change.from('b').when -> result = 'b'
-        ).to.throw 'expected `result;` to change from \'b\', but it did not change'
-
-
-    describe 'mix and match', ->
-
-      it 'can use from to and by in one sentence', ->
-        result = 3
-        expect(-> result).to.change.from(3).to(5).by(2).when -> result = 5

data/vendor/assets/javascripts/spec/chai-changes_spec.js.coffee

@@ -0,0 +1,76 @@
+#= require ./../chai-changes
+
+describe 'Chai-Changes', ->
+
+  describe 'change', ->
+
+    describe 'at all', ->
+
+      it 'detects changes', ->
+        result = 1
+        expect(->
+          expect(-> result).to.change.when -> result = 1
+        ).to.throw 'expected `result;` to change, but it stayed 1'
+        expect(-> result).to.change.when -> result += 1
+
+      it 'can be negated to not.change', ->
+        result = 1
+        expect(->
+          expect(-> result).to.not.change.when -> result += 2
+        ).to.throw 'expected `result;` not to change, but it changed from 1 to 3'
+        expect(-> result).to.not.change.when -> 1 + 3
+
+    describe 'by delta', ->
+
+      it 'asserts the delta of a change', ->
+        result = 1
+        expect(-> result).to.change.by(3).when -> result += 3
+
+      it 'reports the contents of the subject method', ->
+        result = 1
+        expect(->
+          (-> 1 + 3; result).should.change.by(3).when -> result += 2
+        ).to.throw 'expected `1 + 3;result;` to change by 3, but it changed by 2'
+
+    describe 'to', ->
+
+      it 'asserts end values', ->
+        result = ['a']
+        expect(-> result).to.change.to(['b']).when -> result = ['b']
+
+      it 'reports the mismatched end value', ->
+        result = ['a']
+        expect(->
+          expect(-> result).to.change.to(['b']).when -> result = ['c']
+        ).to.throw 'expected `result;` to change to [ \'b\' ], but it changed to [ \'c\' ]'
+
+      it 'raises an error if there was no change', ->
+        result = 'b'
+        expect(->
+          expect(-> result).to.change.to('b').when -> result = 'b'
+        ).to.throw 'expected `result;` to change to \'b\', but it was already \'b\''
+
+    describe 'from', ->
+
+      it 'asserts start values', ->
+        result = ['a']
+        expect(-> result).to.change.from(['a']).when -> result = ['b']
+
+      it 'reports the mismatched start value', ->
+        result = ['a']
+        expect(->
+          expect(-> result).to.change.from(['b']).when -> result = ['c']
+        ).to.throw 'expected `result;` to change from [ \'b\' ], but it changed from [ \'a\' ]'
+
+      it 'raises an error if there was no change', ->
+        result = 'b'
+        expect(->
+          expect(-> result).to.change.from('b').when -> result = 'b'
+        ).to.throw 'expected `result;` to change from \'b\', but it did not change'
+
+    describe 'mix and match', ->
+
+      it 'can use from to and by in one sentence', ->
+        result = 3
+        expect(-> result).to.change.from(3).to(5).by(2).when -> result = 5
+

data/vendor/assets/javascripts/spec/chai-sinon_spec.js.coffee

@@ -1,3 +1,4 @@
+#= require ./../chai-sinon
 
 describe "Sinon Chai Matchers", ->
 

data/vendor/assets/javascripts/spec/factory_spec.js.coffee

@@ -1,3 +1,5 @@
+#= require ./../factories
+
 describe 'Factory', ->
 
   beforeEach ->

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chai-backbone-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -28,10 +28,12 @@ files:
 - lib/chai-backbone-rails/version.rb
 - vendor/assets/javascripts/chai-backbone.js.coffee
 - vendor/assets/javascripts/chai-backbone_spec.js.coffee
+- vendor/assets/javascripts/chai-changes.js.coffee
 - vendor/assets/javascripts/chai-sinon.js.coffee
 - vendor/assets/javascripts/factories.js.coffee
 - vendor/assets/javascripts/sinon-1.4.2.js
 - vendor/assets/javascripts/spec/chai-backbone_spec.js.coffee
+- vendor/assets/javascripts/spec/chai-changes_spec.js.coffee
 - vendor/assets/javascripts/spec/chai-sinon_spec.js.coffee
 - vendor/assets/javascripts/spec/factory_spec.js.coffee
 homepage: https://github.com/matthijsgroen/chai-backbone-rails