minitest-rails 1.0.1 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d0e154d2407f4471ee927d30a1e5bdc7cd7a45d
-  data.tar.gz: 1999eb1058b0131d1a9e6ff88ce66df61d65724e
+  metadata.gz: 543f2ffff937a22e784c7a03b5967fd727e70339
+  data.tar.gz: ad2b3ab73a693afb6d2fb8be571fd5e7eb0eff76
 SHA512:
-  metadata.gz: 0d1d9fd36b7a54fb636a86967c5c928e2085b87750cf12a1595e4d3223ca4dbbbbeec7391f90ea5c78a5c0d1f3e8fa4616719b4587d19041b769650247a1bf25
-  data.tar.gz: b6db1bd9f8bad5f998a2d78f194c9ca9b2c29e26596c3e8edcb5f7ea153ad140a5310ac258aa9640de72a776a88de741e79c9745d7901abc2782824db15a82c5
+  metadata.gz: 3a4951af77f19642c0b6a43f9fc9069ca1f68ccc1c2b34698b00e7bd1c920f62f3473dc2c85f5503057d08ededbfd919980879af76abefc35d39b70a48918fc8
+  data.tar.gz: 23bffd3475c5e31fc5e9adef9582ff9abcf2521f67849f17ede001ca7a4afc0302d7d4deb2d5ef144949b8fd69bba36a96946283deb654f813223fe0cd588347

data/.travis.yml

@@ -2,7 +2,6 @@
 before_install:
   - gem update --system
   - gem --version
-  - ruby gemfiles/minitest_tu_shim.rb
 language: ruby
 notifications:
   email:
@@ -12,13 +11,5 @@ rvm:
   - 2.1.0
   - 2.0.0
   - 1.9.3
-  - 1.8.7
 env:
-  - "RAILS_VERSION=4.0"
-  - "RAILS_VERSION=3.2"
-  - "RAILS_VERSION=3.1"
-  - "RAILS_VERSION=3.0"
-matrix:
-  exclude:
-    - rvm: 1.8.7
-      env: "RAILS_VERSION=4.0"
+  - "RAILS_VERSION=4.1"

data/CHANGELOG.rdoc

@@ -1,27 +1,3 @@
-=== 1.0.1 / 2014-04-15
-
-* Add missing module_namespacing to Helper spec
-
-https://github.com/blowmage/minitest-rails/compare/v1.0.0...v1.0.1
-
-=== 1.0.0 / 2014-04-14
-
-Yay! A 1.0.0 release, finally!
-
-* New rake tasks
-  * rake minitest:quick - Runs default tests without DB prep
-  * rake minitest:all - Runs all test
-  * rake minitest:all:quick - Runs all tests without DB prep
-* Add 'test' rake tasks if not already defined
-* Set the MT_RAILS_NO_AUTORUN flag to stop autorun from being called
-  * Useful for integrating with zeus or other app loaders
-* Support Minitest 5's API
-  * Allow use of Minitest::Test instead of MiniTest::Unit::TestCase
-* Add AS::TC assertions and expectations
-* Add MT_RAILS_NO_AUTORUN flag
-
-https://github.com/blowmage/minitest-rails/compare/v0.9.2...v1.0.0
-
 === 0.9.2 / 2013-04-05
 
 * Fix nested describes in ruby 1.8

data/Gemfile

@@ -2,6 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
-version = ENV["RAILS_VERSION"] || "4.0"
+version = ENV["RAILS_VERSION"] || "4.1"
 
 eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Mike Moore
+Copyright (c) 2014 Mike Moore
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Manifest.txt

@@ -7,43 +7,42 @@ LICENSE
 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
@@ -53,6 +52,7 @@ lib/minitest/rails/version.rb
 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

data/README.rdoc

@@ -1,6 +1,6 @@
 = minitest-rails
 
-MiniTest integration for Rails 3 and 4
+Minitest integration for Rails 4.1+
 
 {<img src="https://secure.travis-ci.org/blowmage/minitest-rails.png" alt="Build Status" />}[http://travis-ci.org/blowmage/minitest-rails]
 {<img src="https://codeclimate.com/github/blowmage/minitest-rails.png" />}[https://codeclimate.com/github/blowmage/minitest-rails]
@@ -23,21 +23,25 @@ Add <tt>minitest-rails</tt> to the Gemfile:
 
     gem "minitest-rails"
 
+If you are running Rails 4.0 or earlier, be sure to specify a 1.x release in the Gemfile:
+
+    gem "minitest-rails", "~> 1.0"
+
 Next run the installation generator with the following:
 
-    rails generate mini_test:install
+    rails generate minitest:install
 
 This will add the <tt>test_helper.rb</tt> file to the <tt>test</tt> directory.
 
 == Usage
 
-This project aims to enable MiniTest within the Rails TestCase classes.
+This project aims to enable Minitest within the Rails TestCase classes.
 Your test will continue to inherit from <tt>ActiveSupport::TestCase</tt>, which will now support the spec DSL.
 You can generate test files with the standard model, controller, resource, and other generators:
 
     rails generate model User
 
-And you can specify generating the tests using the <tt>MiniTest::Spec</tt> DSL on any of the generators by providing the <tt>--spec</tt> option:
+And you can specify generating the tests using the <tt>Minitest::Spec</tt> DSL on any of the generators by providing the <tt>--spec</tt> option:
 
     rails generate model User --spec
 
@@ -48,7 +52,7 @@ And you can specify not generating the fixture for a model by providing the <tt>
 You can also set these as defaults by adding the following to the <tt>config/application.rb</tt> file:
 
     config.generators do |g|
-      g.test_framework :mini_test, :spec => true, :fixture => false
+      g.test_framework :minitest, spec: true, fixture: false
     end
     
 To run your tests, minitest-rails provides multiple rake tasks by default, for a complete list, simply run <tt>rake -T</tt>.
@@ -57,25 +61,19 @@ You can also add any directories under <tt>test/</tt> and minitest-rails will au
 
 If you want to automatically run <tt>rake minitest:api</tt> when you call <tt>rake minitest</tt>, add this line to a new .rake file under <tt>lib/tasks/</tt>:
 
-    MiniTest::Rails::Testing.default_tasks << 'api'
+    Minitest::Rails::Testing.default_tasks << 'api'
 
-== Running on Ruby 1.8
+== Using Rails 4.0 or earlier
 
-Efforts have been made to be compatible with Ruby 1.8.7, but some rough edges may remain. For the latest information on 1.8 compatibility see the wiki: https://github.com/blowmage/minitest-rails/wiki/Running-on-1.8
+For information on running Rails 3.0 through 4.0, see the README for the 1.x branch: https://github.com/blowmage/minitest-rails/tree/1.x#readme
 
 == Capybara
 
 You can use Capybara for feature tests by adding <tt>minitest-rails-capybara</tt> as a dependency. See the README for more information: https://github.com/blowmage/minitest-rails-capybara
 
-== Upgrading
-
-The 0.9 release marks a new direction for minitest-rails. Deprecations have been added for the features that won't make it to 1.0. See instructions for upgrading to 0.9: https://github.com/blowmage/minitest-rails/wiki/Upgrading-to-0.9
-
-== Incompatibilities
-
-Existing tests that call <tt>describe</tt> will not work, since <tt>describe</tt> is used by <tt>MiniTest::Spec</tt> blocks.
+== RSpec Compatibility
 
-RSpec and minitest's spec DSL are incompatible and cannot both be loaded at the same time. If your tests using the spec DSL are not running it is likely the RSpec DSL is also loaded. Check the dependencies and make sure RSpec is only loaded when running the specs.
+RSpec and Minitest's spec DSL are incompatible and both cannot be loaded at the same time. If your tests using the spec DSL are not running it is likely the RSpec DSL is also loaded. Check the dependencies and make sure RSpec is only loaded when running the specs.
 
 If you need to use some RSpec features with minitest-rails require only the needed gems. e.g. To use RSpec mocks with minitest-rails require the "rspec-mocks" gem only, and not the main "rspec" gem which activates the RSpec DSL.
 
@@ -87,7 +85,7 @@ https://groups.google.com/group/minitest-rails
 
 == License
 
-Copyright (c) 2013 Mike Moore
+Copyright (c) 2014 Mike Moore
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -9,8 +9,8 @@ Hoe.plugin :gemspec
 Hoe.spec "minitest-rails" do
   developer "Mike Moore", "mike@blowmage.com"
 
-  self.summary     = "MiniTest integration for Rails 3 and 4"
-  self.description = "Adds MiniTest as the default testing library in Rails 3 and 4"
+  self.summary     = "Minitest integration for Rails 4.1+"
+  self.description = "Adds Minitest as the default testing library in Rails 3 and 4"
   self.urls        = ["http://blowmage.com/minitest-rails"]
 
   self.history_file = "CHANGELOG.rdoc"
@@ -19,10 +19,9 @@ Hoe.spec "minitest-rails" do
 
   license "MIT"
 
-  dependency "minitest",      "~> 4.7"
-  dependency "minitest-test", "~> 1.0"
-  dependency "railties",    [ ">= 3.0", "< 4.1" ]
-  dependency "fakefs",        "= 0.4.3", :dev
+  dependency "minitest", [ ">= 5.3.3", "< 6.0" ]
+  dependency "railties",   "~> 4.1"
+  dependency "fakefs",     "= 0.4.3", :dev
 end
 
 Dir["tasks/**/*.rake"].each { |t| load t }

data/gemfiles/{4.0.gemfile → 4.1.gemfile}

@@ -1,4 +1,5 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 4.0.4"
+gem "rails", "~> 4.1.0"
+gem "sqlite3"
 gem "rake"

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

@@ -0,0 +1,20 @@
+require "generators/minitest"
+
+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_file = "controller_spec.rb"
+        else
+          template_file = "controller_test.rb"
+        end
+        template template_file,
+                 File.join("test/controllers", class_path, "#{file_name}_controller_test.rb")
+      end
+    end
+  end
+end

data/lib/generators/minitest/generator/generator_generator.rb

@@ -0,0 +1,32 @@
+require "generators/minitest"
+
+module Minitest
+  module Generators
+    class GeneratorGenerator < Base
+      check_class_collision suffix: "GeneratorTest"
+
+      class_option :namespace, type: :boolean, default: true,
+                               desc: "Namespace generator under lib/generators/name"
+
+      def create_generator_files
+        if options[:spec]
+          template_file = "generator_spec.rb"
+        else
+          template_file = "generator_test.rb"
+        end
+        template template_file,
+                 File.join("test/lib/generators", class_path, "#{file_name}_generator_test.rb")
+      end
+
+      protected
+
+      def generator_path
+        if options[:namespace]
+          File.join("generators", regular_class_path, file_name, "#{file_name}_generator")
+        else
+          File.join("generators", regular_class_path, "#{file_name}_generator")
+        end
+      end
+    end
+  end
+end

data/lib/generators/minitest/generator/templates/generator_spec.rb

@@ -0,0 +1,14 @@
+require "test_helper"
+require "<%= generator_path %>"
+
+<% module_namespacing do -%>
+describe <%= class_name %>Generator do
+  destination Rails.root.join("tmp/generators")
+  setup :prepare_destination
+
+  # it "generator runs without errors" do
+  #   # No error raised? It passes.
+  #   run_generator ["arguments"]
+  # end
+end
+<% end -%>

data/lib/generators/minitest/generator/templates/generator_test.rb

@@ -0,0 +1,15 @@
+require "test_helper"
+require "<%= generator_path %>"
+
+<% module_namespacing do -%>
+class <%= class_name %>GeneratorTest < Rails::Generators::TestCase
+  tests <%= class_name %>Generator
+  destination Rails.root.join("tmp/generators")
+  setup :prepare_destination
+
+  # def test_generator_runs
+  #   # No error raised? It passes.
+  #   run_generator ["arguments"]
+  # end
+end
+<% end -%>

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

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

data/lib/generators/{mini_test → minitest}/helper/templates/helper_spec.rb

@@ -1,6 +1,5 @@
 require "test_helper"
 
-<% module_namespacing do -%>
 describe <%= class_name %>Helper do
 
   it "must be a real test" do
@@ -8,4 +7,3 @@ describe <%= class_name %>Helper do
   end
 
 end
-<% end -%>

data/lib/generators/{mini_test → minitest}/install/install_generator.rb

@@ -1,9 +1,9 @@
 require 'rails/generators'
 
-module MiniTest
+module Minitest
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
-      class_option :active_record, :type => :boolean, :default => true, :desc => "Add ActiveRecord configuration"
+      class_option :active_record, type: :boolean, default: true, desc: "Add ActiveRecord configuration"
 
       desc <<DESC
 Description:

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

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

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

@@ -0,0 +1,27 @@
+require "generators/minitest"
+
+module Minitest
+  module Generators
+    class MailerGenerator < Base
+      argument :actions, type: :array, default: [], banner: "method method"
+
+      def check_class_collision
+        class_collisions "#{class_name}Test", "#{class_name}Preview"
+      end
+
+      def create_test_files
+        if options[:spec]
+          template_file = "mailer_spec.rb"
+        else
+          template_file = "mailer_test.rb"
+        end
+        template template_file,
+                 File.join("test/mailers", class_path, "#{file_name}_test.rb")
+      end
+
+      def create_preview_files
+        template "preview.rb", File.join("test/mailers/previews", class_path, "#{file_name}_preview.rb")
+      end
+    end
+  end
+end

data/lib/generators/minitest/mailer/templates/preview.rb

@@ -0,0 +1,13 @@
+<% module_namespacing do -%>
+# Preview all emails at http://localhost:3000/rails/mailers/<%= file_path %>
+class <%= class_name %>Preview < ActionMailer::Preview
+<% actions.each do |action| -%>
+
+  # Preview this email at http://localhost:3000/rails/mailers/<%= file_path %>/<%= action %>
+  def <%= action %>
+    <%= class_name %>.<%= action %>
+  end
+<% end -%>
+
+end
+<% end -%>

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

@@ -0,0 +1,42 @@
+require "generators/minitest"
+
+module Minitest
+  module Generators
+    class ModelGenerator < Base
+      RESERVED_YAML_KEYWORDS = %w(y yes n no true false on off null)
+
+      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_file = "model_spec.rb"
+        else
+          template_file = "model_test.rb"
+        end
+        template template_file,
+                 File.join("test/models", class_path, "#{file_name}_test.rb")
+      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
+
+      private
+
+      def yaml_key_value(key, value)
+        if RESERVED_YAML_KEYWORDS.include?(key.downcase)
+          "'#{key}': #{value}"
+        else
+          "#{key}: #{value}"
+        end
+      end
+    end
+  end
+end

data/lib/generators/{mini_test → minitest}/route/route_generator.rb

@@ -1,11 +1,11 @@
-require "generators/mini_test"
+require "generators/minitest"
 
-module MiniTest
+module Minitest
   module Generators
     class RouteGenerator < ::Rails::Generators::Base
 
-      class_option :spec, :type => :boolean, :default => false,
-                          :desc => "Use MiniTest::Spec DSL"
+      class_option :spec, type: :boolean, default: false,
+                          desc: "Use Minitest::Spec DSL"
 
       desc <<DESC
 Description:

data/lib/generators/{mini_test → minitest}/route/templates/route_spec.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 
 # Add the following to your Rake file to test routes by default:
-#   MiniTest::Rails::Testing.default_tasks << "routes"
+#   Minitest::Rails::Testing.default_tasks << "routes"
 
 describe "Route Integration Test" do
   it "route root" do

data/lib/generators/{mini_test → minitest}/route/templates/route_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 
 # Add the following to your Rake file to test routes by default:
-#   MiniTest::Rails::Testing.default_tasks << "routes"
+#   Minitest::Rails::Testing.default_tasks << "routes"
 
 class RouteTest < ActionDispatch::IntegrationTest
   def test_root

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

@@ -0,0 +1,38 @@
+require "generators/minitest"
+require "rails/generators/resource_helpers"
+
+module Minitest
+  module Generators
+    class ScaffoldGenerator < Base
+      include ::Rails::Generators::ResourceHelpers
+
+      check_class_collision suffix: "ControllerTest"
+
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
+
+      def create_test_files
+        if options[:spec]
+          template_file = "controller_spec.rb"
+        else
+          template_file = "controller_test.rb"
+        end
+        template template_file,
+                 File.join("test/controllers", controller_class_path, "#{controller_file_name}_controller_test.rb")
+      end
+
+      private
+
+      def attributes_hash
+        return if attributes_names.empty?
+
+        attributes_names.map do |name|
+          if %w(password password_confirmation).include?(name) && attributes.any?(&:password_digest?)
+            "#{name}: 'secret'"
+          else
+            "#{name}: @#{singular_table_name}.#{name}"
+          end
+        end.sort.join(", ")
+      end
+    end
+  end
+end