jasmine-rails 0.7.1 → 0.7.2

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.
@@ -20,8 +20,8 @@ module JasmineRails
20
20
  end
21
21
 
22
22
  def spec_dir
23
- path = jasmine_config['spec_dir'] || 'spec/javascripts'
24
- Rails.root.join(path)
23
+ paths = jasmine_config['spec_dir'] || 'spec/javascripts'
24
+ [paths].flatten.collect { |path| Rails.root.join(path) }
25
25
  end
26
26
 
27
27
  def tmp_dir
@@ -37,8 +37,10 @@ module JasmineRails
37
37
  def spec_files
38
38
  files = []
39
39
  files += filter_files src_dir, jasmine_config['src_files']
40
- files += filter_files spec_dir, jasmine_config['helpers']
41
- files += filter_files spec_dir, jasmine_config['spec_files']
40
+ spec_dir.each do |dir|
41
+ files += filter_files dir, jasmine_config['helpers']
42
+ files += filter_files dir, jasmine_config['spec_files']
43
+ end
42
44
  files
43
45
  end
44
46
 
@@ -46,13 +48,17 @@ module JasmineRails
46
48
  def css_files
47
49
  files = []
48
50
  files += filter_files css_dir, jasmine_config['css_files']
49
- files += filter_files spec_dir, jasmine_config['css_files']
51
+ spec_dir.each do |dir|
52
+ files += filter_files dir, jasmine_config['css_files']
53
+ end
50
54
  files
51
55
  end
52
56
 
53
57
  # iterate over all directories used as part of the testsuite (including subdirectories)
54
58
  def each_spec_dir(&block)
55
- each_dir spec_dir.to_s, &block
59
+ spec_dir.each do |dir|
60
+ each_dir dir.to_s, &block
61
+ end
56
62
  each_dir src_dir.to_s, &block
57
63
  each_dir css_dir.to_s, &block
58
64
  end
@@ -6,7 +6,9 @@ module JasmineRails
6
6
 
7
7
  initializer :assets do |config|
8
8
  Rails.application.config.assets.paths << Jasmine::Core.path
9
- Rails.application.config.assets.paths << JasmineRails.spec_dir
9
+ JasmineRails.spec_dir.each do |dir|
10
+ Rails.application.config.assets.paths << dir
11
+ end
10
12
  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 jasmine-specs.css)
11
13
  end
12
14
  end
@@ -1,3 +1,3 @@
1
1
  module JasmineRails
2
- VERSION = "0.7.1"
2
+ VERSION = "0.7.2"
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.7.1
4
+ version: 0.7.2
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-04-26 00:00:00.000000000 Z
14
+ date: 2014-05-05 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails
@@ -149,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
149
149
  version: '0'
150
150
  segments:
151
151
  - 0
152
- hash: 3467737068017149832
152
+ hash: 3611368353361621356
153
153
  required_rubygems_version: !ruby/object:Gem::Requirement
154
154
  none: false
155
155
  requirements:
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
158
158
  version: '0'
159
159
  segments:
160
160
  - 0
161
- hash: 3467737068017149832
161
+ hash: 3611368353361621356
162
162
  requirements: []
163
163
  rubyforge_project:
164
164
  rubygems_version: 1.8.23