minitest-rails 0.0.5 → 0.0.6

data/Rakefile

@@ -9,18 +9,16 @@ Hoe.plugins.delete :rubyforge
 Hoe.spec 'minitest-rails' do
   developer 'Mike Moore', 'mike@blowmage.com'
 
-  self.summary     = 'MiniTest integration for Rails 3.1.'
-  self.description = 'Adds MiniTest as the default testing library in Rails.'
+  self.summary     = 'MiniTest integration for Rails 3.'
+  self.description = 'Adds MiniTest as the default testing library in Rails 3.'
   self.url         = 'http://blowmage.com/minitest-rails'
 
   self.history_file = "CHANGELOG.rdoc"
   self.readme_file  = "README.rdoc"
   self.testlib      = :minitest
 
-  extra_deps << ['minitest',      '~> 2.2']
-  extra_deps << ['railties',      '~> 3.1.0.rc1']
-  extra_deps << ['activesupport', '~> 3.1.0.rc1']
-  extra_deps << ['actionpack',    '~> 3.1.0.rc1']
+  extra_deps << ['minitest',  '~> 2.11']
+  extra_deps << ['rails',     '~> 3.1']
 end
 
 # vim: syntax=ruby

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

@@ -1,6 +1,11 @@
 require "minitest_helper"
 
-class <%= class_name %>ControllerTest < MiniTest::Rails::Controller
+describe <%= class_name %>Controller do
+
+  subject { <%= class_name %>Controller }
+
+  # fixtures :all
+
   before do
     @controller = <%= class_name %>Controller.new
   end
@@ -8,4 +13,5 @@ class <%= class_name %>ControllerTest < MiniTest::Rails::Controller
   it "must be a real test" do
     flunk "Need real tests"
   end
+
 end

data/lib/generators/mini_test/helper/templates/helper_spec.rb

@@ -1,11 +1,9 @@
 require "minitest_helper"
 
-class <%= class_name %>HelperTest < MiniTest::Rails::Helper
-  before do
-    @helper= <%= class_name %>Helper.new
-  end
+describe <%= class_name %>Helper do
 
   it "must be a real test" do
     flunk "Need real tests"
   end
+
 end

data/lib/generators/mini_test/install/templates/test/minitest_helper.rb

@@ -1,18 +1,61 @@
 require "minitest/autorun"
 require "minitest/rails"
 
+# Uncomment if you want awesome colorful output
+# require "minitest/pride"
+
 ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 
 class MiniTest::Rails::Spec
+  # Uncomment if you want to support fixtures for all specs
+  # or
+  # place within spec class you want to support fixtures for
+  # include MiniTest::Rails::Fixtures
 
   # Add methods to be used by all specs here...
 
 end
 
-# Uncomment to support fixtures in Model tests...
-# require "active_record/fixtures"
 class MiniTest::Rails::Model
-  # include ActiveRecord::TestFixtures
-  # self.fixture_path = File.join(Rails.root, "test", "fixtures")
+
+  # Add methods to be used by model specs here...
+
+end
+
+MiniTest::Spec.register_spec_type(MiniTest::Rails::Model) do |desc|
+  desc.superclass == ActiveRecord::Base
+end
+
+class MiniTest::Rails::Controller
+  include ActionController::TestCase::Behavior
+  before do
+    @request  = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
+    @routes   = Rails.application.routes
+  end
+
+  # Add methods to be used by controller specs here...
+
+end
+
+MiniTest::Spec.register_spec_type(/Controller$/, MiniTest::Rails::Controller)
+
+class MiniTest::Rails::Helper
+
+  # Add methods to be used by helper specs here...
+
 end
+
+MiniTest::Spec.register_spec_type(/Helper$/, MiniTest::Rails::Helper)
+
+class MiniTest::Rails::Mailer
+
+  # Add methods to be used by mailer specs here...
+
+end
+
+MiniTest::Spec.register_spec_type(MiniTest::Rails::Mailer) do |desc|
+  desc.superclass == ActionMailer::Base
+end
+

data/lib/generators/mini_test/mailer/templates/mailer_spec.rb

@@ -1,6 +1,7 @@
 require "minitest_helper"
 
-class <%= class_name %>Test < MiniTest::Rails::Mailer
+describe <%= class_name %> do
+
 <% actions.each do |action| -%>
   it "<%= action %>" do
     mail = <%= class_name %>.<%= action %>
@@ -9,11 +10,11 @@ class <%= class_name %>Test < MiniTest::Rails::Mailer
     mail.from.must_equal ["from@example.com"]
     mail.body.encoded.must_match "Hi"
   end
-
 <% end -%>
 <% if actions.blank? -%>
   it "must be a real test" do
     flunk "Need real tests"
   end
 <% end -%>
+
 end

data/lib/generators/mini_test/model/templates/fixtures.yml

@@ -1,4 +1,5 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/Fixtures.html
+# Read about fixtures at
+# http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
 
 <% unless attributes.empty? -%>
 one:

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

@@ -1,6 +1,11 @@
 require "minitest_helper"
 
-class <%= class_name %>Test < MiniTest::Rails::Model
+describe <%= class_name %> do
+
+  subject { <%= class_name %>.new }
+
+  # fixtures :all
+
   before do
     @<%= file_name %> = <%= class_name %>.new
   end
@@ -19,4 +24,5 @@ class <%= class_name %>Test < MiniTest::Rails::Model
   #     @<%= file_name %>.interesting?.must_equal true
   #   end
   # end
-end
+
+end

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

@@ -1,8 +1,13 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>ControllerTest < MiniTest::Rails::Controller
-  setup do
+describe <%= class_name %>Controller do
+
+  subject { <%= class_name %>Controller }
+
+  # fixtures :all
+
+  before do
     @<%= singular_table_name %> = <%= table_name %>(:one)
   end
 
@@ -47,5 +52,6 @@ class <%= class_name %>ControllerTest < MiniTest::Rails::Controller
 
     assert_redirected_to <%= index_helper %>_path
   end
+
 end
 <% end -%>

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

@@ -2,7 +2,7 @@ require "minitest_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>ControllerTest < MiniTest::Rails::Controller
-  setup do
+  before do
     @<%= singular_table_name %> = <%= table_name %>(:one)
   end
 

data/lib/minitest-rails.rb

@@ -1,8 +1,9 @@
 require "rails"
+require "minitest/unit"
 
 module MiniTest
   module Rails
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
     class Railtie < ::Rails::Railtie
       # config.app_generators.integration_tool :mini_test
       config.app_generators.test_framework :mini_test

data/lib/minitest/rails.rb

@@ -2,3 +2,4 @@ require "minitest/rails/model"
 require "minitest/rails/controller"
 require "minitest/rails/helper"
 require "minitest/rails/mailer"
+require "minitest/rails/fixtures"

data/lib/minitest/rails/controller.rb

@@ -1,10 +1,15 @@
 require "minitest/rails/spec"
-# require "action_controller"
+require "active_support/test_case"
+require "action_controller/test_case"
 
 module MiniTest
   module Rails
     class Controller < Spec
-      # include ActionController::TestCase::Behavior
+      include ActiveSupport::Testing::SetupAndTeardown
+      include ActionController::TestCase::Behavior
+      before do
+        @routes = Rails.application.routes
+      end
     end
   end
 end

data/lib/minitest/rails/spec.rb

@@ -6,6 +6,9 @@ module MiniTest
   module Rails
     class Spec < ::MiniTest::Spec
       alias :method_name :__name__ if defined? :__name__
+      class << self
+        alias :context :describe
+      end
     end
   end
 end

data/test/test_controller_generator.rb

@@ -33,7 +33,10 @@ class TestControllerGenerator < MiniTest::Unit::TestCase
     assert_match(/create  test\/controllers\/user_controller_test.rb/m, text)
     assert File.exists? "test/controllers/user_controller_test.rb"
     contents = open("test/controllers/user_controller_test.rb").read
-    assert_match(/class UserControllerTest < MiniTest::Rails::Controller/m, contents)
+    assert_match(/describe UserController do/m, contents)
+    assert_match(/subject \{ UserController \}/m, contents)
+    assert_match(/# fixtures :all/m, contents)
+    assert_match(/@controller = UserController.new/m, contents)
     assert_match(/it "must be a real test"/m, contents)
   ensure
     FileUtils.rm_r "test/controllers"

data/test/test_helper_generator.rb

@@ -32,7 +32,7 @@ class TestHelperGenerator < MiniTest::Unit::TestCase
     assert_match(/create  test\/helpers\/user_helper_test.rb/m, text)
     assert File.exists? "test/helpers/user_helper_test.rb"
     contents = open("test/helpers/user_helper_test.rb").read
-    assert_match(/class UserHelperTest < MiniTest::Rails::Helper/m, contents)
+    assert_match(/describe UserHelper do/m, contents)
   ensure
     FileUtils.rm_r "test/helpers"
   end

data/test/test_install_generator.rb

@@ -19,6 +19,15 @@ class TestInstallGenerator < MiniTest::Unit::TestCase
     assert File.exists? "test/minitest_helper.rb"
     contents = open("test/minitest_helper.rb").read
     assert_match(/class MiniTest::Rails::Spec/m, contents)
+    assert_match(/# include MiniTest::Rails::Fixtures/m, contents)
+    assert_match(/class MiniTest::Rails::Model/m, contents)
+    assert_match(/MiniTest::Spec.register_spec_type\(MiniTest::Rails::Model\) do/m, contents)
+    assert_match(/class MiniTest::Rails::Controller/m, contents)
+    assert_match(/MiniTest::Spec.register_spec_type\(\/Controller\$\/, MiniTest::Rails::Controller\)/m, contents)
+    assert_match(/class MiniTest::Rails::Helper/m, contents)
+    assert_match(/MiniTest::Spec.register_spec_type\(\/Helper\$\/, MiniTest::Rails::Helper\)/m, contents)
+    assert_match(/class MiniTest::Rails::Mailer/m, contents)
+    assert_match(/MiniTest::Spec.register_spec_type\(MiniTest::Rails::Mailer\) do/m, contents)
   ensure
     # TODO: Don"t write the files
     # I agree, it would be better to mock the file getting written

data/test/test_mailer_generator.rb

@@ -27,12 +27,13 @@ class TestMailerGenerator < MiniTest::Unit::TestCase
 
   def test_mailer_generator_spec
     text = capture(:stdout) do
-      MiniTest::Generators::MailerGenerator.start ["notification", "--spec"]
+      MiniTest::Generators::MailerGenerator.start ["notification", "welcome", "--spec"]
     end
     assert_match(/create  test\/mailers\/notification_test.rb/m, text)
     assert File.exists? "test/mailers/notification_test.rb"
     contents = open("test/mailers/notification_test.rb").read
-    assert_match(/class NotificationTest < MiniTest::Rails::Mailer/m, contents)
+    assert_match(/describe Notification do/m, contents)
+    assert_match(/it "welcome" do/m, contents)
   ensure
     FileUtils.rm_r "test/mailers"
   end

data/test/test_model_generator.rb

@@ -32,7 +32,9 @@ class TestModelGenerator < MiniTest::Unit::TestCase
     assert_match(/create  test\/models\/user_test.rb/m, text)
     assert File.exists? "test/models/user_test.rb"
     contents = open("test/models/user_test.rb").read
-    assert_match(/class UserTest < MiniTest::Rails::Model/m, contents)
+    assert_match(/describe User do/m, contents)
+    assert_match(/subject \{ User.new \}/, contents)
+    assert_match(/# fixtures :all/, contents)
   ensure
     FileUtils.rm_r "test/models"
   end

data/test/test_scaffold_generator.rb

@@ -33,7 +33,8 @@ class TestScaffoldGenerator < MiniTest::Unit::TestCase
     assert_match(/create  test\/controllers\/user_controller_test.rb/m, text)
     assert File.exists? "test/controllers/user_controller_test.rb"
     contents = open("test/controllers/user_controller_test.rb").read
-    assert_match(/class UserControllerTest < MiniTest::Rails::Controller/m, contents)
+    assert_match(/describe UserController do/m, contents)
+    assert_match(/subject \{ UserController \}/m, contents)
     assert_match(/it "must get index"/m, contents)
   ensure
     FileUtils.rm_r "test/controllers"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,71 +9,61 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-22 00:00:00.000000000 -06:00
-default_executable: 
+date: 2012-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2156686680 !ruby/object:Gem::Requirement
+  requirement: &70095363735960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.11'
   type: :runtime
   prerelease: false
-  version_requirements: *2156686680
+  version_requirements: *70095363735960
 - !ruby/object:Gem::Dependency
-  name: railties
-  requirement: &2156686020 !ruby/object:Gem::Requirement
+  name: rails
+  requirement: &70095363735520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc1
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2156686020
+  version_requirements: *70095363735520
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &2156678320 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &70095363735080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc1
-  type: :runtime
-  prerelease: false
-  version_requirements: *2156678320
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: &2156677900 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0.rc1
-  type: :runtime
+        version: '3.10'
+  type: :development
   prerelease: false
-  version_requirements: *2156677900
+  version_requirements: *70095363735080
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2156677420 !ruby/object:Gem::Requirement
+  requirement: &70095363734640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.5
+        version: '2.16'
   type: :development
   prerelease: false
-  version_requirements: *2156677420
-description: Adds MiniTest as the default testing library in Rails.
+  version_requirements: *70095363734640
+description: Adds MiniTest as the default testing library in Rails 3.
 email:
 - mike@blowmage.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.rdoc
 - Manifest.txt
+- README.rdoc
 files:
 - .autotest
 - CHANGELOG.rdoc
@@ -115,7 +105,6 @@ files:
 - test/test_model_generator.rb
 - test/test_scaffold_generator.rb
 - .gemtest
-has_rdoc: true
 homepage: http://blowmage.com/minitest-rails
 licenses: []
 post_install_message: 
@@ -138,10 +127,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: minitest-rails
-rubygems_version: 1.6.2
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
-summary: MiniTest integration for Rails 3.1.
+summary: MiniTest integration for Rails 3.
 test_files:
 - test/test_controller_generator.rb
 - test/test_helper_generator.rb