Merge branch 'master' into clear_all_environments_log_by_default

1 files changed, 16 insertions, 1 deletions

diff --git a/actionview/Rakefile b/actionview/Rakefile
index 6c3fc59b0a..cba4684076 100644
--- a/actionview/Rakefile
+++ b/actionview/Rakefile
@@ -3,7 +3,7 @@ require "rake/testtask"
 desc "Default Task"
 task default: :test
 
-task :package
+task package: "assets:compile"
 
 # Run the unit tests
 
@@ -46,6 +46,21 @@ namespace :test do
   end
 end
 
+namespace :ujs do
+  desc "Starts the test server"
+  task :server do
+    system "bundle exec rackup test/ujs/config.ru -p 4567 -s puma"
+  end
+end
+
+namespace :assets do
+  desc "Compile Action View assets"
+  task :compile do
+    require "blade"
+    Blade.build
+  end
+end
+
 task :lines do
   load File.expand_path("..", File.dirname(__FILE__)) + "/tools/line_statistics"
   files = FileList["lib/**/*.rb"]