Skip to content

Commit cc3774f

Browse files
committed
Fix rails 6 dummy app setup and gem versions for others
1 parent 6fa6599 commit cc3774f

File tree

5 files changed

+20
-1
lines changed

5 files changed

+20
-1
lines changed

Rakefile

+6
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ task :dummy_generate do
4242
system('touch test/dummy/db/schema.rb')
4343
FileUtils.cp 'test/fixtures/database.yml', 'test/dummy/config/'
4444
FileUtils.rm_r Dir.glob('test/dummy/test/*')
45+
46+
# rails 6 needs this to be present before start:
47+
FileUtils.mkdir_p('test/dummy/app/assets/config')
48+
FileUtils.mkdir_p('test/dummy/app/assets/javascripts')
49+
FileUtils.cp 'test/fixtures/manifest.js', 'test/dummy/app/assets/config/'
50+
FileUtils.cp 'test/fixtures/wicked.js', 'test/dummy/app/assets/javascripts/'
4551
end
4652

4753
desc 'Remove dummy application'

gemfiles/4.0.gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ source "https://rubygems.org"
22

33
gem 'rdoc'
44
gem 'rails', '~> 4.0.0'
5+
gem 'sqlite3', '~> 1.3.6'
56

67
gemspec path: '../'

gemfiles/4.1.gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ source 'https://rubygems.org'
22

33
gem 'rdoc'
44
gem 'rails', '~> 4.1.0'
5+
gem 'sqlite3', '~> 1.3.6'
56

67
gemspec path: '../'

test/fixtures/manifest.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
//= link_tree ../images
2+
//= link wicked.js
3+
//= link wicked.css

test/test_helper.rb

+9-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,15 @@
1919
File.open(destination, 'w') { |f| f.write(source) }
2020

2121
# Copy JS file
22-
destination = assets_dir.join('javascripts/wicked.js')
22+
js_dir = assets_dir.join('javascripts')
23+
Dir.mkdir(js_dir) unless File.directory?(js_dir)
24+
destination = js_dir.join('wicked.js')
2325
source = File.read('test/fixtures/wicked.js')
2426
File.open(destination, 'w') { |f| f.write(source) }
27+
28+
config_dir = assets_dir.join('config')
29+
Dir.mkdir(config_dir) unless File.directory?(config_dir)
30+
source = File.read('test/fixtures/manifest.js')
31+
destination = config_dir.join('manifest.js')
32+
File.open(destination, 'w') { |f| f.write(source) }
2533
end

0 commit comments

Comments
 (0)