diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2016-10-21 17:41:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-21 17:41:55 -0500 |
| commit | f6df3d9a7a992f67164f13a1c03ae35a0b766c42 (patch) | |
| tree | 25adaf9d5e82bd0d9fa465621005e6af258f38b9 /actioncable/Rakefile | |
| parent | 5dce39e82929382ea8d0f93a6dd21fb0ed6d95a0 (diff) | |
| parent | 51de32b2ec8543a91a8a37013445455dd1d02115 (diff) | |
| download | rails-f6df3d9a7a992f67164f13a1c03ae35a0b766c42.tar.gz rails-f6df3d9a7a992f67164f13a1c03ae35a0b766c42.tar.bz2 rails-f6df3d9a7a992f67164f13a1c03ae35a0b766c42.zip | |
Merge pull request #26862 from headius/lazy_load_blade_for_tests
Lazy-load blade for actioncable tests; no blade on JRuby.
Diffstat (limited to 'actioncable/Rakefile')
| -rw-r--r-- | actioncable/Rakefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actioncable/Rakefile b/actioncable/Rakefile index 648de57004..87d443919c 100644 --- a/actioncable/Rakefile +++ b/actioncable/Rakefile @@ -1,7 +1,6 @@ require "rake/testtask" require "pathname" require "action_cable" -require "blade" dir = File.dirname(__FILE__) @@ -25,6 +24,7 @@ namespace :test do end task :integration do + require "blade" if ENV["CI"] Blade.start(interface: :ci) else @@ -36,6 +36,7 @@ end namespace :assets do desc "Compile Action Cable assets" task :compile do + require "blade" Blade.build end end |