jasmine-rails 0.6.0 → 0.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -36,7 +36,8 @@
36
36
  stopped : "stopped",
37
37
  running : "running",
38
38
  fail : "fail",
39
- success : "success"
39
+ success : "success",
40
+ skipped_or_pending : "skipped or pending"
40
41
  };
41
42
 
42
43
  proto.reportRunnerStarting = proto.jasmineStarted = function(runner) {
@@ -44,20 +45,23 @@
44
45
  this.start_time = (new Date()).getTime();
45
46
  this.executed_specs = 0;
46
47
  this.passed_specs = 0;
48
+ this.skipped_or_pending_specs = 0;
47
49
  this.log("Starting...");
48
50
  };
49
51
 
50
52
  proto.reportRunnerResults = proto.jasmineDone = function(runner) {
51
- var failed = this.executed_specs - this.passed_specs;
53
+ var failed = this.executed_specs - this.passed_specs - this.skipped_or_pending_specs;
52
54
  var spec_str = this.executed_specs + (this.executed_specs === 1 ? " spec, " : " specs, ");
53
55
  var fail_str = failed + (failed === 1 ? " failure in " : " failures in ");
56
+ var skipped_or_pending_str = this.skipped_or_pending_specs ? this.skipped_or_pending_specs + ' skipped or pending, ' : '';
57
+
54
58
  var color = (failed > 0)? "red" : "green";
55
59
  var dur = (new Date()).getTime() - this.start_time;
56
60
 
57
61
  this.log("");
58
62
  this.log("Finished");
59
63
  this.log("-----------------");
60
- this.log(spec_str + fail_str + (dur/1000) + "s.", color);
64
+ this.log(spec_str + skipped_or_pending_str + fail_str + (dur/1000) + "s.", color);
61
65
 
62
66
  this.status = (failed > 0)? this.statuses.fail : this.statuses.success;
63
67
 
@@ -75,6 +79,7 @@
75
79
  if(spec.results) { //jasmine 1.x
76
80
  var specResult = spec.results()
77
81
  if(specResult.skipped) {
82
+ this.skipped_or_pending_specs++;
78
83
  return;
79
84
  } else if(specResult.passed()) {
80
85
  this.passed_specs++;
@@ -85,6 +90,7 @@
85
90
  this.passed_specs++;
86
91
  return;
87
92
  } else if(spec.status !== "failed") {
93
+ this.skipped_or_pending_specs++;
88
94
  //Skipped or Pending
89
95
  return;
90
96
  }
@@ -7,6 +7,7 @@ module JasmineRails
7
7
  initializer :assets do |config|
8
8
  Rails.application.config.assets.paths << Jasmine::Core.path
9
9
  Rails.application.config.assets.paths << JasmineRails.spec_dir
10
+ Rails.application.config.assets.precompile += %w(jasmine.css boot.js jasmine-boot.js json2.js jasmine.js jasmine-html.js jasmine-console-shims.js jasmine-console-reporter.js jasmine-specs.js)
10
11
  end
11
12
  end
12
13
  end
@@ -1,3 +1,3 @@
1
1
  module JasmineRails
2
- VERSION = "0.6.0"
2
+ VERSION = "0.6.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jasmine-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.6.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2014-02-20 00:00:00.000000000 Z
14
+ date: 2014-04-12 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
148
148
  version: '0'
149
149
  segments:
150
150
  - 0
151
- hash: -2098666322319327429
151
+ hash: 3434837048496906683
152
152
  required_rubygems_version: !ruby/object:Gem::Requirement
153
153
  none: false
154
154
  requirements:
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
157
157
  version: '0'
158
158
  segments:
159
159
  - 0
160
- hash: -2098666322319327429
160
+ hash: 3434837048496906683
161
161
  requirements: []
162
162
  rubyforge_project:
163
163
  rubygems_version: 1.8.23