chai-backbone-rails 0.1.3 → 0.2.0

data/README.md

@@ -41,9 +41,27 @@ this can also be chained further:
 
 ### Changes
 
+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'
+
+    result = ['a']
+    expect(-> result).to.change.to(['b']).when -> result = ['b']
+
+Changes from begin result: 'change.from'
+
+    result = ['a']
+    expect(-> result).to.change.from(['a']).when -> result = ['b']
+
+Mix and match:
+
+    result = 3
+    expect(-> result).to.change.from(3).to(5).by(2).when -> result = 5
+
+
 Using Sinon Chai Matchers
 -------------------------
 
@@ -72,6 +90,8 @@ other objects as you see fit:
 
     Factory.create 'user', name: 'Matthijs'
 
+### Traits
+
 you can also use 'traits':
 
     Factory.define 'user', (attributes = {}, traits...) ->
@@ -88,6 +108,28 @@ you can also use 'traits':
     Factory.create 'male-user', name: 'Matthijs' # => new User name: 'Matthijs', gender: 'male'
     Factory.create 'male-admin-user', name: 'Matthijs' # => new AdminUser name: 'Matthijs', gender: 'male'
 
+### Sequences
+
+Sequences are also supported:
+
+    Factory.define 'counter', ->
+      {
+        amount: @sequence('amount')
+        other: @sequence('other')
+      }
+
+This does not conflict with similar names in other factory definitions.
+
+You can also yield results:
+
+    Factory.define 'abc', ->
+      @sequence (i) -> ['a','b','c'][i]
+
+    # results in:
+    Factory.create('abc') => 'a'
+    Factory.create('abc') => 'b'
+
+
 Contributing
 ------------
 

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

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

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

@@ -115,55 +115,166 @@
 
   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, 'change', true)
+    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')()
-
-      expectedChange: 0
-
-      # verify if our callback is triggered
-      after: (context) ->
-        negate = flag(context, 'negate')
-        flag(context, 'negate', @negate)
-        object = flag(context, 'object')
-        @endValue = object()
-        actualChange = @endValue - @startValue
-
-        result = (@expectedChange is actualChange)
-        result = !result if negate
-        context.assert result,
-          "expected `#{formatFunction object}` to change by #{@expectedChange} but it changed by #{actualChange}",
-          "expected `#{formatFunction object}` not to change, but it changed by #{actualChange}",
+        startValue = flag(context, 'object')()
+        flag(context, 'changeStart', startValue)
+      after: noChangeAssert
 
-        flag(context, 'negate', negate)
     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') || []
-    if definedActions.length > 0
-      action = definedActions[definedActions.length - 1]
-      action.expectedChange = delta
+    # 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/factories.js.coffee

@@ -1,3 +1,12 @@
+sequencer = (property) ->
+  value = if @sequences[property]?
+    @sequences[property] += 1
+  else
+    @sequences[property] = 0
+  if typeof(property) is 'function'
+    property(value)
+  else
+    value
 
 window.Factory =
   factories: {}
@@ -7,14 +16,17 @@ window.Factory =
       throw "Factory name '#{factoryName}' can't use - in name. It clashes with the traits construct"
     if @factories[factoryName]?
       throw "Factory #{factoryName} is already defined"
-    @factories[factoryName] = builder
+    @factories[factoryName] =
+      sequences: {}
+      factory: builder
+      sequence: sequencer
 
   create: (nameWithTraits, options) ->
     traits = nameWithTraits.split '-'
     factoryName = traits.pop()
     unless @factories[factoryName]?
       throw "Factory #{factoryName} does not exist"
-    @factories[factoryName] options, traits...
+    @factories[factoryName].factory options, traits...
 
   resetFactories: ->
     @factories = []

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

@@ -44,21 +44,64 @@ describe 'Chai-Backbone', ->
 
   describe 'change', ->
 
-    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 '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/factory_spec.js.coffee

@@ -32,3 +32,27 @@ describe 'Factory', ->
       result = Factory.create 'male-admin-user'
       result[1].should.deep.equal ['male', 'admin']
 
+
+  describe 'helpers', ->
+
+    describe 'sequence', ->
+
+      beforeEach ->
+        Factory.define 'counter', (options = {}, traits...) ->
+          @sequence('property')
+
+        Factory.define 'otherCounter', (options = {}, traits...) ->
+          @sequence('property')
+
+        Factory.define 'abc', (options = {}, traits...) ->
+          @sequence((c) -> ['a', 'b', 'c'][c])
+
+      it 'provides sequencers scoped to factory and property', ->
+        Factory.create('counter').should.equal 0
+        Factory.create('otherCounter').should.equal 0
+        Factory.create('counter').should.equal 1
+
+      it 'can yield results', ->
+        Factory.create('abc').should.equal 'a'
+        Factory.create('abc').should.equal 'b'
+

metadata

@@ -1,33 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chai-backbone-rails
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Matthijs Groen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-26 00:00:00 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies: []
-
 description: Chai.js matchers for Backbone.js framework
-email: 
+email:
 - matthijs.groen@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -46,36 +36,26 @@ files:
 - vendor/assets/javascripts/spec/factory_spec.js.coffee
 homepage: https://github.com/matthijsgroen/chai-backbone-rails
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A set of assertion matchers to test Backbone code using Konacha in Rails
 test_files: []
-