Skip to content

Commit e8b8cff

Browse files
committed
Merge pull request #167 from Deckluhm/master
Update assets:update Rake task to update _settings.scss to the latest version available + _settings.scss presence test
2 parents 1302500 + 3360a82 commit e8b8cff

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

Rakefile

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ namespace :assets do
1313
sh 'bower install'
1414
sh 'cp -R bower_components/foundation-sites/js/* vendor/assets/js/'
1515
sh 'cp -R bower_components/foundation-sites/scss/* vendor/assets/scss/'
16+
sh 'cp -R bower_components/foundation-sites/scss/settings/_settings.scss lib/generators/foundation/templates'
1617
sh 'cp -R bower_components/motion-ui/src/* vendor/assets/scss/motion-ui'
1718

1819
js_files = Dir['vendor/assets/js/*.js'].sort

spec/features/generator_spec.rb

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
scenario 'stylesheets assets files are added' do
55
application_css_file = IO.read("#{dummy_app_path}/app/assets/stylesheets/application.css")
66

7+
expect(File).to exist("#{dummy_app_path}/app/assets/stylesheets/_settings.scss")
78
expect(File).to exist("#{dummy_app_path}/app/assets/stylesheets/foundation_and_overrides.scss")
89
expect(application_css_file).to match(/require foundation_and_overrides/)
910
end

0 commit comments

Comments
 (0)