jasmine-rails 0.2.4 → 0.3.0

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.
@@ -1,7 +1,3 @@
1
- require 'jasmine'
2
- require 'jasmine-core'
3
-
4
1
  assets = Rails.application.assets
5
-
6
- assets.append_path Jasmine::Config.new.spec_dir
7
- assets.append_path Jasmine::Core.path
2
+ assets.append_path Jasmine::Core.path
3
+ JasmineRails::JhwAdapter.new.asset_paths.each { |path| assets.append_path(path) }
@@ -26,6 +26,15 @@ module JasmineRails
26
26
  ).files
27
27
  end
28
28
 
29
+ def asset_paths
30
+ jasmine_config = YAML.load_file(Jasmine::Headless::Options.new[:jasmine_config])
31
+ [
32
+ jasmine_config["src_dir"],
33
+ jasmine_config["spec_dir"],
34
+ jasmine_config["asset_paths"]
35
+ ].flatten
36
+ end
37
+
29
38
  def instantiate_runner
30
39
  begin
31
40
  Jasmine::Headless::Runner.new(@options)
@@ -1,3 +1,3 @@
1
1
  module JasmineRails
2
- VERSION = "0.2.4"
2
+ VERSION = "0.3.0"
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.2.4
4
+ version: 0.3.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -34,33 +34,17 @@ dependencies:
34
34
  requirement: !ruby/object:Gem::Requirement
35
35
  none: false
36
36
  requirements:
37
- - - <=
37
+ - - ~>
38
38
  - !ruby/object:Gem::Version
39
- version: 1.2.1
39
+ version: '1.3'
40
40
  type: :runtime
41
41
  prerelease: false
42
42
  version_requirements: !ruby/object:Gem::Requirement
43
43
  none: false
44
44
  requirements:
45
- - - <=
45
+ - - ~>
46
46
  - !ruby/object:Gem::Version
47
- version: 1.2.1
48
- - !ruby/object:Gem::Dependency
49
- name: jasmine-core
50
- requirement: !ruby/object:Gem::Requirement
51
- none: false
52
- requirements:
53
- - - <=
54
- - !ruby/object:Gem::Version
55
- version: 1.2.1
56
- type: :runtime
57
- prerelease: false
58
- version_requirements: !ruby/object:Gem::Requirement
59
- none: false
60
- requirements:
61
- - - <=
62
- - !ruby/object:Gem::Version
63
- version: 1.2.1
47
+ version: '1.3'
64
48
  - !ruby/object:Gem::Dependency
65
49
  name: jasmine-headless-webkit
66
50
  requirement: !ruby/object:Gem::Requirement