minitest-rails 1.0.1 → 2.0.0.beta1

data/test/rails/generators/test_spec_type.rb

@@ -1,9 +1,8 @@
 require "helper"
-require "minitest/rails/generators"
 
 class InstallGenerator < Rails::Generators::Base; end
 
-class TestGeneratorsSpecType < MiniTest::Unit::TestCase
+class TestGeneratorsSpecType < Minitest::Test
   def assert_generator actual
     assert_equal Rails::Generators::TestCase, actual
   end
@@ -13,24 +12,24 @@ class TestGeneratorsSpecType < MiniTest::Unit::TestCase
   end
 
   def test_spec_type_resolves_for_class_constants
-    assert_generator MiniTest::Spec.spec_type(InstallGenerator)
+    assert_generator Minitest::Spec.spec_type(InstallGenerator)
   end
 
   def test_spec_type_resolves_for_matching_strings
-    assert_generator MiniTest::Spec.spec_type("InstallGenerator")
-    assert_generator MiniTest::Spec.spec_type("InstallGeneratorTest")
-    assert_generator MiniTest::Spec.spec_type("Install Generator Test")
+    assert_generator Minitest::Spec.spec_type("InstallGenerator")
+    assert_generator Minitest::Spec.spec_type("InstallGeneratorTest")
+    assert_generator Minitest::Spec.spec_type("Install Generator Test")
     # And is not case sensitive
-    assert_generator MiniTest::Spec.spec_type("installgenerator")
-    assert_generator MiniTest::Spec.spec_type("installgeneratortest")
-    assert_generator MiniTest::Spec.spec_type("install generator test")
+    assert_generator Minitest::Spec.spec_type("installgenerator")
+    assert_generator Minitest::Spec.spec_type("installgeneratortest")
+    assert_generator Minitest::Spec.spec_type("install generator test")
   end
 
   def test_spec_type_wont_match_non_space_characters
-    refute_generator MiniTest::Spec.spec_type("Install Generator\tTest")
-    refute_generator MiniTest::Spec.spec_type("Install Generator\rTest")
-    refute_generator MiniTest::Spec.spec_type("Install Generator\nTest")
-    refute_generator MiniTest::Spec.spec_type("Install Generator\fTest")
-    refute_generator MiniTest::Spec.spec_type("Install GeneratorXTest")
+    refute_generator Minitest::Spec.spec_type("Install Generator\tTest")
+    refute_generator Minitest::Spec.spec_type("Install Generator\rTest")
+    refute_generator Minitest::Spec.spec_type("Install Generator\nTest")
+    refute_generator Minitest::Spec.spec_type("Install Generator\fTest")
+    refute_generator Minitest::Spec.spec_type("Install GeneratorXTest")
   end
 end

data/test/test_sanity.rb

@@ -1,7 +1,7 @@
 require "helper"
 
-class TestMiniTest < MiniTest::Unit::TestCase
+class TestMinitest < Minitest::Test
   def test_sanity
-    assert MiniTest::Rails::VERSION
+    assert Minitest::Rails::VERSION
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Mike Moore
@@ -14,48 +14,34 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: minitest-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 5.3.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.3.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
@@ -100,7 +86,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.11'
-description: Adds MiniTest as the default testing library in Rails 3 and 4
+description: Adds Minitest as the default testing library in Rails 3 and 4
 email:
 - mike@blowmage.com
 executables: []
@@ -119,43 +105,42 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- gemfiles/3.0.gemfile
-- gemfiles/3.1.gemfile
-- gemfiles/3.2.gemfile
-- gemfiles/4.0.gemfile
-- gemfiles/minitest_tu_shim.rb
+- gemfiles/4.1.gemfile
 - lib/generators/.document
-- lib/generators/mini_test.rb
-- lib/generators/mini_test/controller/controller_generator.rb
-- lib/generators/mini_test/controller/templates/controller_spec.rb
-- lib/generators/mini_test/controller/templates/controller_test.rb
-- lib/generators/mini_test/helper/helper_generator.rb
-- lib/generators/mini_test/helper/templates/helper_spec.rb
-- lib/generators/mini_test/helper/templates/helper_test.rb
-- lib/generators/mini_test/install/install_generator.rb
-- lib/generators/mini_test/install/templates/test_helper.rb
-- lib/generators/mini_test/integration/integration_generator.rb
-- lib/generators/mini_test/integration/templates/integration_spec.rb
-- lib/generators/mini_test/integration/templates/integration_test.rb
-- lib/generators/mini_test/mailer/mailer_generator.rb
-- lib/generators/mini_test/mailer/templates/mailer_spec.rb
-- lib/generators/mini_test/mailer/templates/mailer_test.rb
-- lib/generators/mini_test/model/model_generator.rb
-- lib/generators/mini_test/model/templates/fixtures.yml
-- lib/generators/mini_test/model/templates/model_spec.rb
-- lib/generators/mini_test/model/templates/model_test.rb
-- lib/generators/mini_test/route/route_generator.rb
-- lib/generators/mini_test/route/templates/route_spec.rb
-- lib/generators/mini_test/route/templates/route_test.rb
-- lib/generators/mini_test/scaffold/scaffold_generator.rb
-- lib/generators/mini_test/scaffold/templates/controller_spec.rb
-- lib/generators/mini_test/scaffold/templates/controller_test.rb
+- lib/generators/minitest.rb
+- lib/generators/minitest/controller/controller_generator.rb
+- lib/generators/minitest/controller/templates/controller_spec.rb
+- lib/generators/minitest/controller/templates/controller_test.rb
+- lib/generators/minitest/generator/generator_generator.rb
+- lib/generators/minitest/generator/templates/generator_spec.rb
+- lib/generators/minitest/generator/templates/generator_test.rb
+- lib/generators/minitest/helper/helper_generator.rb
+- lib/generators/minitest/helper/templates/helper_spec.rb
+- lib/generators/minitest/helper/templates/helper_test.rb
+- lib/generators/minitest/install/install_generator.rb
+- lib/generators/minitest/install/templates/test_helper.rb
+- lib/generators/minitest/integration/integration_generator.rb
+- lib/generators/minitest/integration/templates/integration_spec.rb
+- lib/generators/minitest/integration/templates/integration_test.rb
+- lib/generators/minitest/mailer/mailer_generator.rb
+- lib/generators/minitest/mailer/templates/mailer_spec.rb
+- lib/generators/minitest/mailer/templates/mailer_test.rb
+- lib/generators/minitest/mailer/templates/preview.rb
+- lib/generators/minitest/model/model_generator.rb
+- lib/generators/minitest/model/templates/fixtures.yml
+- lib/generators/minitest/model/templates/model_spec.rb
+- lib/generators/minitest/model/templates/model_test.rb
+- lib/generators/minitest/route/route_generator.rb
+- lib/generators/minitest/route/templates/route_spec.rb
+- lib/generators/minitest/route/templates/route_test.rb
+- lib/generators/minitest/scaffold/scaffold_generator.rb
+- lib/generators/minitest/scaffold/templates/controller_spec.rb
+- lib/generators/minitest/scaffold/templates/controller_test.rb
 - lib/minitest-rails.rb
 - lib/minitest/rails.rb
 - lib/minitest/rails/assertions.rb
 - lib/minitest/rails/constant_lookup.rb
 - lib/minitest/rails/expectations.rb
-- lib/minitest/rails/generators.rb
 - lib/minitest/rails/railtie.rb
 - lib/minitest/rails/tasks/.document
 - lib/minitest/rails/tasks/minitest.rake
@@ -165,6 +150,7 @@ files:
 - minitest-rails.gemspec
 - tasks/test.rake
 - test/generators/test_controller_generator.rb
+- test/generators/test_generator_generator.rb
 - test/generators/test_helper_generator.rb
 - test/generators/test_install_generator.rb
 - test/generators/test_mailer_generator.rb
@@ -205,17 +191,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: MiniTest integration for Rails 3 and 4
+summary: Minitest integration for Rails 4.1+
 test_files:
 - test/generators/test_controller_generator.rb
+- test/generators/test_generator_generator.rb
 - test/generators/test_helper_generator.rb
 - test/generators/test_install_generator.rb
 - test/generators/test_mailer_generator.rb

data/gemfiles/3.0.gemfile

@@ -1,5 +0,0 @@
-source "http://rubygems.org"
-
-gem "rails", "~> 3.0.20"
-gem "rake"
-gem "rdoc", "~> 3.10"

data/gemfiles/3.1.gemfile

@@ -1,5 +0,0 @@
-source "http://rubygems.org"
-
-gem "rails", "~> 3.1.12"
-gem "rake"
-gem "rdoc", "~> 3.10"

data/gemfiles/3.2.gemfile

@@ -1,5 +0,0 @@
-source "http://rubygems.org"
-
-gem "rails", "~> 3.2.17"
-gem "rake"
-gem "rdoc", "~> 3.10"

data/gemfiles/minitest_tu_shim.rb

@@ -1,4 +0,0 @@
-if RUBY_VERSION < "1.9"
-  `gem install minitest_tu_shim`
-  `use_minitest yes`
-end

data/lib/generators/mini_test/controller/controller_generator.rb

@@ -1,19 +0,0 @@
-require "generators/mini_test"
-
-module MiniTest
-  module Generators
-    class ControllerGenerator < Base
-      argument     :actions, :type => :array,   :default => [],    :banner => "action action"
-
-      check_class_collision :suffix => "ControllerTest"
-
-      def create_test_files
-        if options[:spec]
-          template "controller_spec.rb", File.join("test/controllers", class_path, "#{file_name}_controller_test.rb")
-        else
-          template "controller_test.rb", File.join("test/controllers", class_path, "#{file_name}_controller_test.rb")
-        end
-      end
-    end
-  end
-end

data/lib/generators/mini_test/helper/helper_generator.rb

@@ -1,17 +0,0 @@
-require "generators/mini_test"
-
-module MiniTest
-  module Generators
-    class HelperGenerator < Base
-      check_class_collision :suffix => "HelperTest"
-
-      def create_test_files
-        if options[:spec]
-          template "helper_spec.rb", File.join("test/helpers", class_path, "#{file_name}_helper_test.rb")
-        else
-          template "helper_test.rb", File.join("test/helpers", class_path, "#{file_name}_helper_test.rb")
-        end
-      end
-    end
-  end
-end

data/lib/generators/mini_test/integration/integration_generator.rb

@@ -1,17 +0,0 @@
-require "generators/mini_test"
-
-module MiniTest
-  module Generators
-    class IntegrationGenerator < Base
-      check_class_collision :suffix => "Test"
-
-      def create_test_files
-        if options[:spec]
-          template 'integration_spec.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
-        else
-          template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
-        end
-      end
-    end
-  end
-end

data/lib/generators/mini_test/mailer/mailer_generator.rb

@@ -1,19 +0,0 @@
-require "generators/mini_test"
-
-module MiniTest
-  module Generators
-    class MailerGenerator < Base
-      argument     :actions, :type => :array,   :default => [],    :banner => "method method"
-
-      check_class_collision :suffix => "MailerTest"
-
-      def create_test_files
-        if options[:spec]
-          template "mailer_spec.rb", File.join("test","mailers", class_path, "#{file_name}_test.rb")
-        else
-          template "mailer_test.rb", File.join("test","mailers", class_path, "#{file_name}_test.rb")
-        end
-      end
-    end
-  end
-end

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

@@ -1,28 +0,0 @@
-require "generators/mini_test"
-
-module MiniTest
-  module Generators
-    class ModelGenerator < Base
-      argument     :attributes, :type => :array,   :default => [],    :banner => "field:type field:type"
-      class_option :fixture,    :type => :boolean, :default => true,  :desc => "Create fixture file"
-
-      check_class_collision :suffix => "Test"
-
-      def create_test_file
-        if options[:spec]
-          template "model_spec.rb", File.join("test","models", class_path, "#{file_name}_test.rb")
-        else
-          template "model_test.rb", File.join("test","models", class_path, "#{file_name}_test.rb")
-        end
-      end
-
-      hook_for :fixture_replacement
-
-      def create_fixture_file
-        if options[:fixture] && options[:fixture_replacement].nil?
-          template "fixtures.yml", File.join("test","fixtures", class_path, "#{plural_file_name}.yml")
-        end
-      end
-    end
-  end
-end

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

@@ -1,42 +0,0 @@
-require "generators/mini_test"
-require "rails/generators/resource_helpers"
-
-module MiniTest
-  module Generators
-    class ScaffoldGenerator < Base
-      include ::Rails::Generators::ResourceHelpers
-      argument     :actions, :type => :array,   :default => [],    :banner => "action action"
-
-      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",
-                   File.join("test/controllers",
-                             class_path,
-                             "#{controller_file_name}_controller_test.rb")
-        else
-          template "controller_test.rb",
-                   File.join("test/controllers",
-                             class_path,
-                             "#{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.rb

@@ -1,42 +0,0 @@
-require 'rails/generators/named_base'
-
-module MiniTest
-  module Generators
-    class Base < ::Rails::Generators::NamedBase #:nodoc:
-
-      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
-
-      protected
-
-      # Fill in methods that might be missing depending on the version of Rails
-
-      def module_namespacing(&block)
-        yield if block_given?
-      end unless instance_methods(true).map(&:to_sym).include? :module_namespacing
-
-      def key_value(key, value)
-        if options[:old_style_hash] || RUBY_VERSION < '1.9'
-          ":#{key} => #{value}"
-        else
-          "#{key}: #{value}"
-        end
-      end unless instance_methods(true).map(&:to_sym).include? :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 unless instance_methods(true).map(&:to_sym).include? :attributes_names
-
-    end
-  end
-end

data/lib/minitest/rails/generators.rb

@@ -1,18 +0,0 @@
-require "minitest/rails"
-require "rails/generators/test_case"
-
-class Rails::Generators::TestCase
-  register_spec_type(self) do |desc|
-    Class === desc && desc < Rails::Generators::Base
-  end
-
-  register_spec_type(/Generator( ?Test)?\z/i, self)
-
-  def self.determine_default_generator(name)
-    generator = determine_constant_from_test_name(name) do |constant|
-      Class === constant && constant < Rails::Generators::Base
-    end
-    raise NameError.new("Unable to resolve generator for #{name}") if generator.nil?
-    generator
-  end
-end