konacha-chai-matchers 0.0.6 → 0.0.7

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,7 +1,7 @@
1
1
  module Konacha
2
2
  module Chai
3
3
  module Matchers
4
- VERSION = "0.0.6"
4
+ VERSION = "0.0.7"
5
5
  end
6
6
  end
7
7
  end
@@ -22,7 +22,7 @@
22
22
  */
23
23
 
24
24
  chai.Assertion.addMethod('when', function(val, options) {
25
- var action, definedActions, done, newPromise, object, promiseCallback, result, _i, _j, _len, _len1,
25
+ var action, definedActions, done, isPromise, newPromise, object, promiseCallback, result, _i, _j, _len, _len1,
26
26
  _this = this;
27
27
  if (options == null) {
28
28
  options = {};
@@ -37,7 +37,11 @@
37
37
  }
38
38
  }
39
39
  result = val();
40
- if ((result != null ? result.then : void 0) != null) {
40
+ isPromise = (result != null ? result.then : void 0) != null;
41
+ if (((typeof DS !== "undefined" && DS !== null ? DS.Model : void 0) != null) && result instanceof DS.Model) {
42
+ isPromise = false;
43
+ }
44
+ if (isPromise) {
41
45
  done = options != null ? options.notify : void 0;
42
46
  if (done == null) {
43
47
  done = function() {};
metadata CHANGED
@@ -1,23 +1,33 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: konacha-chai-matchers
3
- version: !ruby/object:Gem::Version
4
- version: 0.0.6
3
+ version: !ruby/object:Gem::Version
4
+ hash: 17
5
5
  prerelease:
6
+ segments:
7
+ - 0
8
+ - 0
9
+ - 7
10
+ version: 0.0.7
6
11
  platform: ruby
7
- authors:
12
+ authors:
8
13
  - Matthijs Groen
9
14
  autorequire:
10
15
  bindir: bin
11
16
  cert_chain: []
12
- date: 2013-01-09 00:00:00.000000000 Z
17
+
18
+ date: 2013-01-10 00:00:00 Z
13
19
  dependencies: []
20
+
14
21
  description: A set of Chai.js libraries ready to use for Konacha
15
- email:
22
+ email:
16
23
  - matthijs.groen@gmail.com
17
24
  executables: []
25
+
18
26
  extensions: []
27
+
19
28
  extra_rdoc_files: []
20
- files:
29
+
30
+ files:
21
31
  - .gitignore
22
32
  - .gitmodules
23
33
  - Gemfile
@@ -41,29 +51,38 @@ files:
41
51
  - vendor/assets/javascripts/mocha-as-promised.js
42
52
  - vendor/assets/javascripts/sinon-chai.js
43
53
  - vendor/assets/javascripts/sinon.js
44
- homepage: ''
45
- licenses:
54
+ homepage: ""
55
+ licenses:
46
56
  - MIT
47
57
  post_install_message:
48
58
  rdoc_options: []
49
- require_paths:
59
+
60
+ require_paths:
50
61
  - lib
51
- required_ruby_version: !ruby/object:Gem::Requirement
62
+ required_ruby_version: !ruby/object:Gem::Requirement
52
63
  none: false
53
- requirements:
54
- - - ! '>='
55
- - !ruby/object:Gem::Version
56
- version: '0'
57
- required_rubygems_version: !ruby/object:Gem::Requirement
64
+ requirements:
65
+ - - ">="
66
+ - !ruby/object:Gem::Version
67
+ hash: 3
68
+ segments:
69
+ - 0
70
+ version: "0"
71
+ required_rubygems_version: !ruby/object:Gem::Requirement
58
72
  none: false
59
- requirements:
60
- - - ! '>='
61
- - !ruby/object:Gem::Version
62
- version: '0'
73
+ requirements:
74
+ - - ">="
75
+ - !ruby/object:Gem::Version
76
+ hash: 3
77
+ segments:
78
+ - 0
79
+ version: "0"
63
80
  requirements: []
81
+
64
82
  rubyforge_project: konacha-chai-matchers
65
- rubygems_version: 1.8.15
83
+ rubygems_version: 1.8.10
66
84
  signing_key:
67
85
  specification_version: 3
68
86
  summary: Chai.js plugins collection for Konacha
69
87
  test_files: []
88
+