Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Default jasmine.yml appropriate for asset pipeline

- Remove old Rails 2 defaults from the > 3 generators.
  These defaults aren't suitable for Rails
  3.0, but few users will be adding Jasmine to a 3.0 project.

- Update Rails 3 examples for asset pipeline
  • Loading branch information...
commit 2c2df6611ed20b9067167065cbbd82866f56f00b 1 parent 4bf0b6c
Rajan Agaskar authored
2  lib/generators/jasmine/examples/examples_generator.rb
@@ -7,7 +7,7 @@ def self.source_root
7 7 end
8 8
9 9 def copy_example_files
10   - directory 'public'
  10 + directory 'app'
11 11 directory 'spec'
12 12 end
13 13
0  ...tes/public/javascripts/jasmine_examples/Player.js → ...app/assets/javascripts/jasmine_examples/Player.js
File renamed without changes
0  ...lates/public/javascripts/jasmine_examples/Song.js → ...s/app/assets/javascripts/jasmine_examples/Song.js
File renamed without changes
7 lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine.yml
@@ -11,12 +11,7 @@
11 11 # - dist/**/*.js
12 12 #
13 13 src_files:
14   - - public/javascripts/prototype.js
15   - - public/javascripts/effects.js
16   - - public/javascripts/controls.js
17   - - public/javascripts/dragdrop.js
18   - - public/javascripts/application.js
19   - - public/javascripts/**/*.js
  14 + - assets/application.js
20 15
21 16 # stylesheets
22 17 #
4 spec/jasmine_rails3_spec.rb
@@ -57,8 +57,8 @@
57 57 output = `rails g jasmine:examples`
58 58 output.should include("create")
59 59
60   - File.exists?("public/javascripts/jasmine_examples/Player.js").should == true
61   - File.exists?("public/javascripts/jasmine_examples/Song.js").should == true
  60 + File.exists?("app/assets/javascripts/jasmine_examples/Player.js").should == true
  61 + File.exists?("app/assets/javascripts/jasmine_examples/Song.js").should == true
62 62
63 63 File.exists?("spec/javascripts/jasmine_examples/PlayerSpec.js").should == true
64 64 File.exists?("spec/javascripts/helpers/SpecHelper.js").should == true

0 comments on commit 2c2df66

Please sign in to comment.
Something went wrong with that request. Please try again.