Merge pull request rails-api#7 from abakas/master

Remove additional asset artifacts from generated app
libin · Apr 24, 2012 · 9760231 · 9760231
2 parents d0a7831 + 4a2a8af
commit 9760231
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/rails-api/generators/rails/app/app_generator.rb b/lib/rails-api/generators/rails/app/app_generator.rb
@@ -4,3 +4,8 @@
 Rails::Generators::AppGenerator.source_paths.unshift(
   File.expand_path('../../../../templates/rails/app', __FILE__)
 )
+
+class Rails::AppBuilder
+  undef tmp
+  undef vendor
+end
diff --git a/test/generators/app_generator_test.rb b/test/generators/app_generator_test.rb
@@ -10,6 +10,7 @@ def test_skeleton_is_created
     run_generator
 
     default_files.each { |path| assert_file path }
+    skipped_files.each { |path| assert_no_file path }
   end
 
   def test_api_modified_files
@@ -18,6 +19,7 @@ def test_api_modified_files
     assert_file "Gemfile" do |content|
       assert_match(/gem 'rails-api'/, content)
       assert_no_match(/gem 'coffee-rails'/, content)
+      assert_no_match(/gem 'jquery-rails'/, content)
       assert_no_match(/gem 'sass-rails'/, content)
     end
     assert_file "app/controllers/application_controller.rb", /ActionController::API/
@@ -47,10 +49,11 @@ def default_files
        test/functional
        test/integration
        test/performance
-       test/unit
-       vendor
-       vendor/assets
-       tmp/cache
+       test/unit)
+  end
+
+  def skipped_files
+    %w(vendor/assets
        tmp/cache/assets)
   end
 end