minitest-rails 0.2 → 1.0.0.beta1

data/lib/generators/mini_test/model/model_generator.rb

@@ -5,15 +5,14 @@ module MiniTest
     class ModelGenerator < Base
       argument     :attributes, :type => :array,   :default => [],    :banner => "field:type field:type"
       class_option :fixture,    :type => :boolean, :default => true,  :desc => "Create fixture file"
-      class_option :spec,       :type => :boolean, :default => false, :desc => "Use MiniTest::Spec DSL"
 
       check_class_collision :suffix => "Test"
 
       def create_test_file
         if options[:spec]
-          template "model_spec.rb", "test/models/#{file_name}_test.rb"
+          template "model_spec.rb", File.join("test","models", class_path, "#{file_name}_test.rb")
         else
-          template "model_test.rb", "test/models/#{file_name}_test.rb"
+          template "model_test.rb", File.join("test","models", class_path, "#{file_name}_test.rb")
         end
       end
 
@@ -21,7 +20,7 @@ module MiniTest
 
       def create_fixture_file
         if options[:fixture] && options[:fixture_replacement].nil?
-          template "fixtures.yml", "test/fixtures/#{plural_file_name}.yml"
+          template "fixtures.yml", File.join("test","fixtures", class_path, "#{plural_file_name}.yml")
         end
       end
     end

data/lib/generators/mini_test/model/templates/model_spec.rb

@@ -1,13 +1,11 @@
-require "minitest_helper"
+require "test_helper"
 
 <% module_namespacing do -%>
 describe <%= class_name %> do
-  before do
-    @<%= file_name %> = <%= class_name %>.new
-  end
+  let(:<%= file_name %>) { <%= class_name %>.new }
 
   it "must be valid" do
-    @<%= file_name %>.valid?.must_equal true
+    <%= file_name %>.must_be :valid?
   end
 end
 <% end -%>

data/lib/generators/mini_test/model/templates/model_test.rb

@@ -1,9 +1,15 @@
-require "minitest_helper"
+require "test_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>Test < MiniTest::Rails::ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+class <%= class_name %>Test < ActiveSupport::TestCase
+
+  def <%= file_name %>
+    @<%= file_name %> ||= <%= class_name %>.new
+  end
+
+  def test_valid
+    assert <%= file_name %>.valid?
+  end
+
 end
 <% end -%>

data/lib/generators/mini_test/route/route_generator.rb

@@ -0,0 +1,28 @@
+require "generators/mini_test"
+
+module MiniTest
+  module Generators
+    class RouteGenerator < ::Rails::Generators::Base
+
+      class_option :spec, :type => :boolean, :default => false,
+                          :desc => "Use MiniTest::Spec DSL"
+
+      desc <<DESC
+Description:
+    Creates a route test.
+DESC
+
+      def self.source_root
+        @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      end
+
+      def create_test_files
+        if options[:spec]
+          template "route_spec.rb", File.join("test", "routes", "route_test.rb")
+        else
+          template "route_test.rb", File.join("test", "routes", "route_test.rb")
+        end
+      end
+    end
+  end
+end

data/lib/generators/mini_test/route/templates/route_spec.rb

@@ -0,0 +1,10 @@
+require "test_helper"
+
+# Add the following to your Rake file to test routes by default:
+#   MiniTest::Rails::Testing.default_tasks << "routes"
+
+describe "Route Integration Test" do
+  it "route root" do
+    assert_routing "/", controller: "home", action: "show"
+  end
+end

data/lib/generators/mini_test/route/templates/route_test.rb

@@ -0,0 +1,10 @@
+require "test_helper"
+
+# Add the following to your Rake file to test routes by default:
+#   MiniTest::Rails::Testing.default_tasks << "routes"
+
+class RouteTest < ActionDispatch::IntegrationTest
+  def test_root
+    assert_routing "/", controller: "home", action: "show"
+  end
+end

data/lib/generators/mini_test/scaffold/scaffold_generator.rb

@@ -6,10 +6,11 @@ module MiniTest
     class ScaffoldGenerator < Base
       include ::Rails::Generators::ResourceHelpers
       argument     :actions, :type => :array,   :default => [],    :banner => "action action"
-      class_option :spec,    :type => :boolean, :default => false, :desc   => "Use MiniTest::Spec DSL"
 
       check_class_collision :suffix => "ControllerTest"
 
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
       def create_test_files
         if options[:spec]
           template "controller_spec.rb",
@@ -23,6 +24,19 @@ module MiniTest
                              "#{controller_file_name}_controller_test.rb")
         end
       end
+
+      def accessible_attributes
+        attributes.reject(&:reference?)
+      end
+
+      def attributes_hash
+        return if accessible_attributes.empty?
+
+        accessible_attributes.map do |a|
+          name = a.name
+          key_value name, "@#{singular_table_name}.#{name}"
+        end.sort.join(', ')
+      end
     end
   end
 end

data/lib/generators/mini_test/scaffold/templates/controller_spec.rb

@@ -1,49 +1,47 @@
-require "minitest_helper"
+require "test_helper"
 
 <% module_namespacing do -%>
 describe <%= controller_class_name %>Controller do
 
-  before do
-    @<%= singular_table_name %> = <%= class_name %>.new
-  end
+  let(:<%= singular_table_name %>) { <%= table_name %> :one }
 
-  it "must get index" do
+  it "gets index" do
     get :index
     assert_response :success
     assert_not_nil assigns(:<%= table_name %>)
   end
 
-  it "must get new" do
+  it "gets new" do
     get :new
     assert_response :success
   end
 
-  it "must create <%= singular_table_name %>" do
+  it "creates <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
-      post :create, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+      post :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     end
 
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
-  it "must show <%= singular_table_name %>" do
-    get :show, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+  it "shows <%= singular_table_name %>" do
+    get :show, <%= key_value :id, "#{singular_table_name}" %>
     assert_response :success
   end
 
-  it "must get edit" do
-    get :edit, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+  it "gets edit" do
+    get :edit, <%= key_value :id, "#{singular_table_name}" %>
     assert_response :success
   end
 
-  it "must update <%= singular_table_name %>" do
-    put :update, <%= key_value :id, "@#{singular_table_name}.to_param" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+  it "updates <%= singular_table_name %>" do
+    put :update, <%= key_value :id, "#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
-  it "must destroy <%= singular_table_name %>" do
+  it "destroys <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+      delete :destroy, <%= key_value :id, "#{singular_table_name}" %>
     end
 
     assert_redirected_to <%= index_helper %>_path

data/lib/generators/mini_test/scaffold/templates/controller_test.rb

@@ -1,10 +1,10 @@
-require "minitest_helper"
+require "test_helper"
 
 <% module_namespacing do -%>
-class <%= controller_class_name %>ControllerTest < MiniTest::Rails::ActionController::TestCase
+class <%= controller_class_name %>ControllerTest < ActionController::TestCase
 
-  before do
-    @<%= singular_table_name %> = <%= class_name %>.new
+  def <%= singular_table_name %>
+    @<%= singular_table_name %> ||= <%= table_name %> :one
   end
 
   def test_index
@@ -20,30 +20,30 @@ class <%= controller_class_name %>ControllerTest < MiniTest::Rails::ActionContro
 
   def test_create
     assert_difference('<%= class_name %>.count') do
-      post :create, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+      post :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     end
 
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   def test_show
-    get :show, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :show, <%= key_value :id, singular_table_name %>
     assert_response :success
   end
 
   def test_edit
-    get :edit, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :edit, <%= key_value :id, singular_table_name %>
     assert_response :success
   end
 
   def test_update
-    put :update, <%= key_value :id, "@#{singular_table_name}.to_param" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+    put :update, <%= key_value :id, singular_table_name %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   def test_destroy
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+      delete :destroy, <%= key_value :id, singular_table_name %>
     end
 
     assert_redirected_to <%= index_helper %>_path

data/lib/generators/mini_test.rb

@@ -3,24 +3,40 @@ require 'rails/generators/named_base'
 module MiniTest
   module Generators
     class Base < ::Rails::Generators::NamedBase #:nodoc:
-      def self.source_root
-        @_minitest_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'mini_test', generator_name, 'templates'))
+
+      class_option :old_style_hash, :type => :boolean, :default => false,
+                                    :desc => "Force using old style hash (:foo => 'bar') on Ruby >= 1.9"
+
+      class_option :spec, :type => :boolean, :default => false,
+                          :desc => "Use MiniTest::Spec DSL"
+
+      def self.default_source_root
+        File.expand_path(File.join(File.dirname(__FILE__), 'mini_test', generator_name, 'templates'))
       end
 
-      if ::Rails.version.to_f < 3.1
-        protected
-        # These methods don't exist in Rails 3.0
-        def module_namespacing(&block)
-          yield if block_given?
+      protected
+
+      # Fill in methods that might be missing depending on the version of Rails
+
+      def module_namespacing(&block)
+        yield if block_given?
+      end unless respond_to? :module_namespacing
+
+      def key_value(key, value)
+        if options[:old_style_hash] || RUBY_VERSION < '1.9'
+          ":#{key} => #{value}"
+        else
+          "#{key}: #{value}"
         end
-        def key_value(key, value)
-          if options[:old_style_hash] || RUBY_VERSION < '1.9'
-            ":#{key} => #{value}"
-          else
-            "#{key}: #{value}"
-          end
+      end unless respond_to? :key_value
+
+      def attributes_names
+        @attributes_names ||= attributes.each_with_object([]) do |a, names|
+          names << a.column_name
+          names << "#{a.name}_type" if a.polymorphic?
         end
-      end
+      end unless respond_to? :attributes_names
+
     end
   end
 end