jasmine 1.0.2.0 → 1.0.2.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.
Files changed (56) hide show
  1. data/HOW_TO_TEST.markdown +4 -6
  2. data/generators/jasmine/templates/lib/tasks/jasmine.rake +8 -2
  3. data/generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yml +1 -1
  4. data/jasmine.gemspec +4 -5
  5. data/jasmine/Gemfile +2 -2
  6. data/jasmine/HowToRelease.markdown +29 -0
  7. data/jasmine/MIT.LICENSE +1 -1
  8. data/jasmine/README.markdown +37 -15
  9. data/jasmine/Rakefile +42 -58
  10. data/jasmine/example/spec/SpecHelper.js +3 -3
  11. data/jasmine/images/jasmine_favicon.png +0 -0
  12. data/jasmine/jshint/jshint.js +5919 -0
  13. data/jasmine/jshint/run.js +98 -0
  14. data/jasmine/lib/jasmine-html.js +5 -3
  15. data/jasmine/lib/jasmine.js +56 -32
  16. data/jasmine/spec/node_suite.js +233 -0
  17. data/jasmine/spec/runner.html +4 -2
  18. data/jasmine/spec/suites/EnvSpec.js +1 -1
  19. data/jasmine/spec/suites/ExceptionsSpec.js +2 -2
  20. data/jasmine/spec/suites/JsApiReporterSpec.js +1 -1
  21. data/jasmine/spec/suites/MatchersSpec.js +9 -9
  22. data/jasmine/spec/suites/MultiReporterSpec.js +3 -3
  23. data/jasmine/spec/suites/SpecRunningSpec.js +1 -1
  24. data/jasmine/spec/suites/SpecSpec.js +1 -1
  25. data/jasmine/spec/suites/TrivialConsoleReporterSpec.js +431 -0
  26. data/jasmine/spec/suites/UtilSpec.js +0 -1
  27. data/jasmine/spec/suites/WaitsForBlockSpec.js +32 -1
  28. data/jasmine/src/Env.js +2 -2
  29. data/jasmine/src/Matchers.js +3 -3
  30. data/jasmine/src/PrettyPrinter.js +2 -1
  31. data/jasmine/src/WaitsBlock.js +3 -1
  32. data/jasmine/src/WaitsForBlock.js +4 -2
  33. data/jasmine/src/base.js +39 -20
  34. data/jasmine/src/console/TrivialConsoleReporter.js +144 -0
  35. data/jasmine/src/html/TrivialReporter.js +5 -3
  36. data/jasmine/src/util.js +1 -1
  37. data/jasmine/src/version.json +2 -2
  38. data/lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine.yml +1 -1
  39. data/lib/generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yml +1 -1
  40. data/lib/jasmine.rb +1 -20
  41. data/lib/jasmine/railtie.rb +20 -0
  42. data/lib/jasmine/run.html.erb +2 -1
  43. data/lib/jasmine/version.rb +2 -2
  44. data/spec/spec_helper.rb +0 -2
  45. metadata +16 -58
  46. data/install.rb +0 -2
  47. data/jasmine/images/fail-16.png +0 -0
  48. data/jasmine/images/fail.png +0 -0
  49. data/jasmine/images/go-16.png +0 -0
  50. data/jasmine/images/go.png +0 -0
  51. data/jasmine/images/pending-16.png +0 -0
  52. data/jasmine/images/pending.png +0 -0
  53. data/jasmine/images/question-bk.png +0 -0
  54. data/jasmine/images/questionbk-16.png +0 -0
  55. data/jasmine/images/spinner.gif +0 -0
  56. data/lib/jasmine/generator.rb +0 -9
data/jasmine/src/html/TrivialReporter.js CHANGED
@@ -110,7 +110,7 @@ jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) {
110
110
  jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
111
111
  var results = suite.results();
112
112
  var status = results.passed() ? 'passed' : 'failed';
113
- if (results.totalCount == 0) { // todo: change this to check results.skipped
113
+ if (results.totalCount === 0) { // todo: change this to check results.skipped
114
114
  status = 'skipped';
115
115
  }
116
116
  this.suiteDivs[suite.id].className += " " + status;
@@ -183,6 +183,8 @@ jasmine.TrivialReporter.prototype.specFilter = function(spec) {
183
183
  paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
184
184
  }
185
185
 
186
- if (!paramMap["spec"]) return true;
187
- return spec.getFullName().indexOf(paramMap["spec"]) == 0;
186
+ if (!paramMap.spec) {
187
+ return true;
188
+ }
189
+ return spec.getFullName().indexOf(paramMap.spec) === 0;
188
190
  };
data/jasmine/src/util.js CHANGED
@@ -17,7 +17,7 @@ jasmine.util.inherit = function(childClass, parentClass) {
17
17
  var subclass = function() {
18
18
  };
19
19
  subclass.prototype = parentClass.prototype;
20
- childClass.prototype = new subclass;
20
+ childClass.prototype = new subclass();
21
21
  };
22
22
 
23
23
  jasmine.util.formatException = function(e) {
data/jasmine/src/version.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "major": 1,
3
- "minor": 0,
4
- "build": 1
3
+ "minor": 1,
4
+ "build": 0
5
5
  }
data/lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine.yml CHANGED
@@ -56,7 +56,7 @@ helpers:
56
56
  # - **/*[sS]pec.js
57
57
  #
58
58
  spec_files:
59
- - **/*[sS]pec.js
59
+ - '**/*[sS]pec.js'
60
60
 
61
61
  # src_dir
62
62
  #
data/lib/generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yml CHANGED
@@ -56,7 +56,7 @@ helpers:
56
56
  # - **/*[sS]pec.js
57
57
  #
58
58
  spec_files:
59
- - **/*[sS]pec.js
59
+ - '**/*[sS]pec.js'
60
60
 
61
61
  # src_dir
62
62
  #
data/lib/jasmine.rb CHANGED
@@ -5,29 +5,10 @@ jasmine_files = ['base',
5
5
  'spec_builder',
6
6
  'command_line_tool']
7
7
 
8
- jasmine_files << 'generator' if Gem.available? "rails", ">= 3.0"
9
-
10
8
  jasmine_files.each do |file|
11
9
  require File.join('jasmine', file)
12
10
  end
13
11
 
14
- if Jasmine.rails3?
15
- module Jasmine
16
- class Railtie < Rails::Railtie
12
+ require File.join('jasmine', "railtie") if Jasmine.rails3?
17
13
 
18
- config.before_configuration do
19
- old_jasmine_rakefile = ::Rails.root.join('lib', 'tasks', 'jasmine.rake')
20
- if old_jasmine_rakefile.exist?
21
- raise RuntimeError.new(
22
- "You no longer need to have jasmine.rake in your project, as it is now automatically loaded " +
23
- "from the Jasmine gem. Please delete '#{old_jasmine_rakefile}' before continuing."
24
- )
25
- end
26
- end
27
14
 
28
- rake_tasks do
29
- load "jasmine/tasks/jasmine.rake"
30
- end
31
- end
32
- end
33
- end
data/lib/jasmine/railtie.rb ADDED
@@ -0,0 +1,20 @@
1
+ require "rails/railtie"
2
+ module Jasmine
3
+ class Railtie < Rails::Railtie
4
+
5
+ config.before_configuration do
6
+ old_jasmine_rakefile = ::Rails.root.join('lib', 'tasks', 'jasmine.rake')
7
+ if old_jasmine_rakefile.exist? && !ENV["USE_JASMINE_RAKE"]
8
+ puts %Q{
9
+ You no longer need to have jasmine.rake in your project, as it is now automatically loaded
10
+ from the Jasmine gem. To silence this warning, set "USE_JASMINE_RAKE=true" in your environment
11
+ or remove jasmine.rake.
12
+ }
13
+ end
14
+ end
15
+
16
+ rake_tasks do
17
+ load "jasmine/tasks/jasmine.rake"
18
+ end
19
+ end
20
+ end
data/lib/jasmine/run.html.erb CHANGED
@@ -3,8 +3,9 @@
3
3
  <head>
4
4
  <meta content="text/html;charset=UTF-8" http-equiv="Content-Type"/>
5
5
  <title>Jasmine suite</title>
6
+ <link rel="shortcut icon" type="image/png" href="/__JASMINE_ROOT__/images/jasmine_favicon.png">
6
7
  <% css_files.each do |css_file| %>
7
- <link rel="stylesheet" href="<%= css_file %>" type="text/css" media="screen"/>
8
+ <link rel="stylesheet" href="<%= css_file %>" type="text/css" media="screen"/>
8
9
  <% end %>
9
10
 
10
11
  <% jasmine_files.each do |jasmine_file| %>
data/lib/jasmine/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Jasmine
2
- VERSION = "1.0.2.0"
3
- end
2
+ VERSION = "1.0.2.1"
3
+ end
data/spec/spec_helper.rb CHANGED
@@ -4,8 +4,6 @@ require 'stringio'
4
4
  require 'tmpdir'
5
5
 
6
6
  Bundler.setup(:default, :development)
7
- #Using syck because of 1.9.2/bundler incompatibilites -- this will need to change with the next patch release of 1.9.2
8
- YAML::ENGINE.yamler = 'syck' if defined?(YAML::ENGINE)
9
7
 
10
8
  def rspec2?
11
9
  Gem.available? "rspec", ">= 2.0"
metadata CHANGED
@@ -1,13 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jasmine
3
3
  version: !ruby/object:Gem::Version
4
- prerelease: false
5
- segments:
6
- - 1
7
- - 0
8
- - 2
9
- - 0
10
- version: 1.0.2.0
4
+ prerelease:
5
+ version: 1.0.2.1
11
6
  platform: ruby
12
7
  authors:
13
8
  - Rajan Agaskar
@@ -17,8 +12,8 @@ autorequire:
17
12
  bindir: bin
18
13
  cert_chain: []
19
14
 
20
- date: 2011-04-02 00:00:00 -04:00
21
- default_executable: jasmine
15
+ date: 2011-05-16 00:00:00 -04:00
16
+ default_executable:
22
17
  dependencies:
23
18
  - !ruby/object:Gem::Dependency
24
19
  name: rspec
@@ -27,10 +22,6 @@ dependencies:
27
22
  requirements:
28
23
  - - ">="
29
24
  - !ruby/object:Gem::Version
30
- segments:
31
- - 2
32
- - 5
33
- - 0
34
25
  version: 2.5.0
35
26
  type: :development
36
27
  prerelease: false
@@ -42,10 +33,6 @@ dependencies:
42
33
  requirements:
43
34
  - - ">="
44
35
  - !ruby/object:Gem::Version
45
- segments:
46
- - 3
47
- - 0
48
- - 3
49
36
  version: 3.0.3
50
37
  type: :development
51
38
  prerelease: false
@@ -57,10 +44,6 @@ dependencies:
57
44
  requirements:
58
45
  - - ">="
59
46
  - !ruby/object:Gem::Version
60
- segments:
61
- - 1
62
- - 2
63
- - 1
64
47
  version: 1.2.1
65
48
  type: :development
66
49
  prerelease: false
@@ -72,8 +55,6 @@ dependencies:
72
55
  requirements:
73
56
  - - ">="
74
57
  - !ruby/object:Gem::Version
75
- segments:
76
- - 0
77
58
  version: "0"
78
59
  type: :development
79
60
  prerelease: false
@@ -85,10 +66,6 @@ dependencies:
85
66
  requirements:
86
67
  - - ">="
87
68
  - !ruby/object:Gem::Version
88
- segments:
89
- - 0
90
- - 0
91
- - 16
92
69
  version: 0.0.16
93
70
  type: :development
94
71
  prerelease: false
@@ -100,8 +77,6 @@ dependencies:
100
77
  requirements:
101
78
  - - ">="
102
79
  - !ruby/object:Gem::Version
103
- segments:
104
- - 0
105
80
  version: "0"
106
81
  type: :development
107
82
  prerelease: false
@@ -113,9 +88,6 @@ dependencies:
113
88
  requirements:
114
89
  - - ">="
115
90
  - !ruby/object:Gem::Version
116
- segments:
117
- - 1
118
- - 1
119
91
  version: "1.1"
120
92
  type: :runtime
121
93
  prerelease: false
@@ -127,10 +99,6 @@ dependencies:
127
99
  requirements:
128
100
  - - ">="
129
101
  - !ruby/object:Gem::Version
130
- segments:
131
- - 1
132
- - 3
133
- - 1
134
102
  version: 1.3.1
135
103
  type: :runtime
136
104
  prerelease: false
@@ -142,10 +110,6 @@ dependencies:
142
110
  requirements:
143
111
  - - ">="
144
112
  - !ruby/object:Gem::Version
145
- segments:
146
- - 1
147
- - 4
148
- - 3
149
113
  version: 1.4.3
150
114
  type: :runtime
151
115
  prerelease: false
@@ -157,10 +121,6 @@ dependencies:
157
121
  requirements:
158
122
  - - ">="
159
123
  - !ruby/object:Gem::Version
160
- segments:
161
- - 0
162
- - 1
163
- - 3
164
124
  version: 0.1.3
165
125
  type: :runtime
166
126
  prerelease: false
@@ -195,7 +155,6 @@ files:
195
155
  - generators/jasmine/templates/spec/javascripts/support/jasmine.yml
196
156
  - generators/jasmine/templates/spec/javascripts/support/jasmine_config.rb
197
157
  - generators/jasmine/templates/spec/javascripts/support/jasmine_runner.rb
198
- - install.rb
199
158
  - jasmine.gemspec
200
159
  - lib/generators/jasmine/examples/USAGE
201
160
  - lib/generators/jasmine/examples/examples_generator.rb
@@ -220,7 +179,7 @@ files:
220
179
  - lib/jasmine/base.rb
221
180
  - lib/jasmine/command_line_tool.rb
222
181
  - lib/jasmine/config.rb
223
- - lib/jasmine/generator.rb
182
+ - lib/jasmine/railtie.rb
224
183
  - lib/jasmine/run.html.erb
225
184
  - lib/jasmine/selenium_driver.rb
226
185
  - lib/jasmine/server.rb
@@ -244,15 +203,9 @@ files:
244
203
  - jasmine/example/src/Player.js
245
204
  - jasmine/example/src/Song.js
246
205
  - jasmine/Gemfile
247
- - jasmine/images/fail-16.png
248
- - jasmine/images/fail.png
249
- - jasmine/images/go-16.png
250
- - jasmine/images/go.png
251
- - jasmine/images/pending-16.png
252
- - jasmine/images/pending.png
253
- - jasmine/images/question-bk.png
254
- - jasmine/images/questionbk-16.png
255
- - jasmine/images/spinner.gif
206
+ - jasmine/Gemfile.lock
207
+ - jasmine/HowToRelease.markdown
208
+ - jasmine/images/jasmine_favicon.png
256
209
  - jasmine/jsdoc-template/allclasses.tmpl
257
210
  - jasmine/jsdoc-template/allfiles.tmpl
258
211
  - jasmine/jsdoc-template/class.tmpl
@@ -262,6 +215,8 @@ files:
262
215
  - jasmine/jsdoc-template/static/header.html
263
216
  - jasmine/jsdoc-template/static/index.html
264
217
  - jasmine/jsdoc-template/symbol.tmpl
218
+ - jasmine/jshint/jshint.js
219
+ - jasmine/jshint/run.js
265
220
  - jasmine/lib/jasmine-html.js
266
221
  - jasmine/lib/jasmine.css
267
222
  - jasmine/lib/jasmine.js
@@ -269,6 +224,7 @@ files:
269
224
  - jasmine/MIT.LICENSE
270
225
  - jasmine/Rakefile
271
226
  - jasmine/README.markdown
227
+ - jasmine/spec/node_suite.js
272
228
  - jasmine/spec/runner.html
273
229
  - jasmine/spec/suites/BaseSpec.js
274
230
  - jasmine/spec/suites/CustomMatchersSpec.js
@@ -287,11 +243,13 @@ files:
287
243
  - jasmine/spec/suites/SpecSpec.js
288
244
  - jasmine/spec/suites/SpySpec.js
289
245
  - jasmine/spec/suites/SuiteSpec.js
246
+ - jasmine/spec/suites/TrivialConsoleReporterSpec.js
290
247
  - jasmine/spec/suites/TrivialReporterSpec.js
291
248
  - jasmine/spec/suites/UtilSpec.js
292
249
  - jasmine/spec/suites/WaitsForBlockSpec.js
293
250
  - jasmine/src/base.js
294
251
  - jasmine/src/Block.js
252
+ - jasmine/src/console/TrivialConsoleReporter.js
295
253
  - jasmine/src/Env.js
296
254
  - jasmine/src/html/jasmine.css
297
255
  - jasmine/src/html/TrivialReporter.js
@@ -324,7 +282,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
324
282
  requirements:
325
283
  - - ">="
326
284
  - !ruby/object:Gem::Version
327
- hash: 92967853
285
+ hash: -825589677
328
286
  segments:
329
287
  - 0
330
288
  version: "0"
@@ -333,14 +291,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
333
291
  requirements:
334
292
  - - ">="
335
293
  - !ruby/object:Gem::Version
336
- hash: 92967853
294
+ hash: -825589677
337
295
  segments:
338
296
  - 0
339
297
  version: "0"
340
298
  requirements: []
341
299
 
342
300
  rubyforge_project:
343
- rubygems_version: 1.3.7
301
+ rubygems_version: 1.6.2
344
302
  signing_key:
345
303
  specification_version: 3
346
304
  summary: JavaScript BDD framework
data/install.rb DELETED
@@ -1,2 +0,0 @@
1
- xjasmine_bin = File.expand_path(File.join(File.dirname(__FILE__), 'bin', 'jasmine'))
2
- `#{jasmine_bin} init`
data/jasmine/images/fail-16.png DELETED
Binary file
data/jasmine/images/fail.png DELETED
Binary file
data/jasmine/images/go-16.png DELETED
Binary file
data/jasmine/images/go.png DELETED
Binary file
data/jasmine/images/pending-16.png DELETED
Binary file
data/jasmine/images/pending.png DELETED
Binary file
data/jasmine/images/question-bk.png DELETED
Binary file
data/jasmine/images/questionbk-16.png DELETED
Binary file
data/jasmine/images/spinner.gif DELETED
Binary file
data/lib/jasmine/generator.rb DELETED
@@ -1,9 +0,0 @@
1
- require 'rails'
2
-
3
- module Jasmine
4
- class Railtie < ::Rails::Railtie
5
- rake_tasks do
6
- load "jasmine/tasks/jasmine.rake"
7
- end
8
- end
9
- end