minitest-rails 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60a4c54263833134bc0d3af5380166f6ed21b396
-  data.tar.gz: ae5f176d7b529f2d62abfb67674502e330e0f1e3
+  metadata.gz: 1c324bab2cf306972e4b226bc31db9b4f053f1bf
+  data.tar.gz: ef52eb65b39d3cd23e9eaf96dbe672b5a7710291
 SHA512:
-  metadata.gz: 937426e1f1d82d3f3665bc5a8f6bac79d32d8ca4527a60b08953f24c47f30c56ba2505740edd327bf94819dc56a271e2db5b5bfd36455d2f9480259c60f9693e
-  data.tar.gz: 767cf06ec9bfc0f19e766e7519145be15080a9bd6a09d8a377c4d81eeb7e620585d068059cf7e60e9003073dbeec1aad1af9a3f7814f12980b7049276e20bb92
+  metadata.gz: 0f73788eeb9edf7bb8a6ba0bf786b827148349dee0085c618cc8715ed337363f2402c03e4d8bf5b89117a66a7e9e93812d079ae1f93917c9a636c09116d5751d
+  data.tar.gz: 5fe9b55ac56a6c7334c505be134c7192e36309b8e1ac695f689ad3a628d685b5714417521d56db38673a0d99782aaf0c6a35e3a58ea0eb4df7e4d82bdf71fd75

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 2.1.0 / 2014-07-08
+
+* Allow use of additional_spec in Minitest's Spec DSL.
+
+https://github.com/blowmage/minitest-rails/compare/v2.0.3...v2.1.0
+
 === 2.0.3 / 2014-06-11
 
 * Fix bug in loading rake tasks (rmm5t)

data/Rakefile

@@ -19,9 +19,9 @@ Hoe.spec "minitest-rails" do
 
   license "MIT"
 
-  dependency "minitest", [ ">= 5.3.3", "< 6.0" ]
-  dependency "railties",   "~> 4.1"
-  dependency "fakefs",     "= 0.4.3", :dev
+  dependency "minitest", "~> 5.4"
+  dependency "railties", "~> 4.1"
+  dependency "fakefs",   "= 0.4.3", :dev
 end
 
 Dir["tasks/**/*.rake"].each { |t| load t }

data/lib/minitest/rails.rb

@@ -32,8 +32,8 @@ class ActiveSupport::TestCase
       desc < ActiveRecord::Base if desc.is_a?(Class)
     end
   end
-  register_spec_type(self) do |desc, addl|
-    :model == addl
+  register_spec_type(self) do |desc, *addl|
+    addl.include? :model
   end
 end
 
@@ -44,8 +44,8 @@ class ActionController::TestCase
     Class === desc && desc < ActionController::Metal
   end
   register_spec_type(/Controller( ?Test)?\z/i, self)
-  register_spec_type(self) do |desc, addl|
-    :controller == addl
+  register_spec_type(self) do |desc, *addl|
+    addl.include? :controller
   end
 
   # Resolve the controller from the test name when using the spec DSL
@@ -62,8 +62,9 @@ require "action_view/test_case"
 class ActionView::TestCase
   # Use AV::TestCase for the base class for helpers and views
   register_spec_type(/(Helper( ?Test)?| View Test)\z/i, self)
-  register_spec_type(self) do |desc, addl|
-    [ :view, :helper ].include? addl
+  register_spec_type(self) do |desc, *addl|
+    addl.include?(:view) ||
+    addl.include?(:helper)
   end
 
   # Resolve the helper or view from the test name when using the spec DSL
@@ -83,8 +84,8 @@ if defined? ActionMailer
       desc < ActionMailer::Base if desc.is_a?(Class)
     end
     register_spec_type(/Mailer( ?Test)?\z/i, self)
-  register_spec_type(self) do |desc, addl|
-    :mailer == addl
+  register_spec_type(self) do |desc, *addl|
+    addl.include? :mailer
   end
 
     # Resolve the mailer from the test name when using the spec DSL
@@ -102,8 +103,8 @@ require "action_dispatch/testing/integration"
 class ActionDispatch::IntegrationTest
   # Register by name, consider Acceptance to be deprecated
   register_spec_type(/(Integration|Acceptance)( ?Test)?\z/i, self)
-  register_spec_type(self) do |desc, addl|
-    :integration == addl
+  register_spec_type(self) do |desc, *addl|
+    addl.include? :integration
   end
 end
 
@@ -112,8 +113,8 @@ class Rails::Generators::TestCase
     desc < Rails::Generators::Base if desc.is_a?(Class)
   end
   register_spec_type(/Generator( ?Test)?\z/i, self)
-  register_spec_type(self) do |desc, addl|
-    :generator == addl
+  register_spec_type(self) do |desc, *addl|
+    addl.include? :generator
   end
 
   def self.determine_default_generator(name)

data/lib/minitest/rails/version.rb

@@ -1,5 +1,5 @@
 module Minitest
   module Rails
-    VERSION = "2.0.3"
+    VERSION = "2.1.0"
   end
 end

data/minitest-rails.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: minitest-rails 2.0.3.20140611120000 ruby lib
+# stub: minitest-rails 2.1.0.20140708182826 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "minitest-rails"
-  s.version = "2.0.3.20140611120000"
+  s.version = "2.1.0.20140708182826"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Mike Moore"]
-  s.date = "2014-06-11"
+  s.date = "2014-07-09"
   s.description = "Adds Minitest as the default testing library in Rails"
   s.email = ["mike@blowmage.com"]
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "Manifest.txt", "README.rdoc"]
@@ -24,20 +24,20 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<minitest>, ["< 6.0", ">= 5.3.3"])
+      s.add_runtime_dependency(%q<minitest>, ["~> 5.4"])
       s.add_runtime_dependency(%q<railties>, ["~> 4.1"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_development_dependency(%q<fakefs>, ["= 0.4.3"])
       s.add_development_dependency(%q<hoe>, ["~> 3.12"])
     else
-      s.add_dependency(%q<minitest>, ["< 6.0", ">= 5.3.3"])
+      s.add_dependency(%q<minitest>, ["~> 5.4"])
       s.add_dependency(%q<railties>, ["~> 4.1"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_dependency(%q<fakefs>, ["= 0.4.3"])
       s.add_dependency(%q<hoe>, ["~> 3.12"])
     end
   else
-    s.add_dependency(%q<minitest>, ["< 6.0", ">= 5.3.3"])
+    s.add_dependency(%q<minitest>, ["~> 5.4"])
     s.add_dependency(%q<railties>, ["~> 4.1"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])
     s.add_dependency(%q<fakefs>, ["= 0.4.3"])

data/test/rails/action_controller/test_spec_type.rb

@@ -35,8 +35,13 @@ class TestApplicationControllerSpecType < Minitest::Test
     refute_controller Minitest::Spec.spec_type("Widget ControllerXTest")
   end
 
-  def test_spec_type_resolves_for_additional_desc_controller
+  def test_spec_type_doesnt_resolve_random_strings
     refute_controller Minitest::Spec.spec_type("Unmatched String")
-    assert_controller Minitest::Spec.spec_type(["Unmatched String", :controller])
+  end
+
+  def test_spec_type_resolves_for_additional_desc_controller
+    assert_controller Minitest::Spec.spec_type("Unmatched String", :controller)
+    assert_controller Minitest::Spec.spec_type("Unmatched String", :controller, :other)
+    assert_controller Minitest::Spec.spec_type("Unmatched String", :other, :controller)
   end
 end

data/test/rails/action_dispatch/test_spec_type.rb

@@ -49,8 +49,13 @@ class TestActionDispatchSpecType < Minitest::Test
     refute_dispatch Minitest::Spec.spec_type("Widget IntegrationXTest")
   end
 
-  def test_spec_type_resolves_for_additional_desc_integration
+  def test_spec_type_doesnt_resolve_random_strings
     refute_dispatch Minitest::Spec.spec_type("Unmatched String")
-    assert_dispatch Minitest::Spec.spec_type(["Unmatched String", :integration])
+  end
+
+  def test_spec_type_resolves_for_additional_desc_integration
+    assert_dispatch Minitest::Spec.spec_type("Unmatched String", :integration)
+    assert_dispatch Minitest::Spec.spec_type("Unmatched String", :integration, :other)
+    assert_dispatch Minitest::Spec.spec_type("Unmatched String", :other, :integration)
   end
 end

data/test/rails/action_mailer/test_spec_type.rb

@@ -35,8 +35,13 @@ class TestActionMailerSpecType < Minitest::Test
     refute_mailer Minitest::Spec.spec_type("Widget MailerXTest")
   end
 
-  def test_spec_type_resolves_for_additional_desc_mailer
+  def test_spec_type_doesnt_resolve_random_strings
     refute_mailer Minitest::Spec.spec_type("Unmatched String")
-    assert_mailer Minitest::Spec.spec_type(["Unmatched String", :mailer])
+  end
+
+  def test_spec_type_resolves_for_additional_desc_mailer
+    assert_mailer Minitest::Spec.spec_type("Unmatched String", :mailer)
+    assert_mailer Minitest::Spec.spec_type("Unmatched String", :mailer, :other)
+    assert_mailer Minitest::Spec.spec_type("Unmatched String", :other, :mailer)
   end
 end

data/test/rails/action_view/test_spec_type.rb

@@ -40,9 +40,19 @@ class TestActionViewSpecType < Minitest::Test
     refute_view Minitest::Spec.spec_type("Widget HelperXTest")
   end
 
-  def test_spec_type_resolves_for_additional_desc_view_or_helper
+  def test_spec_type_doesnt_resolve_random_strings
     refute_view Minitest::Spec.spec_type("Unmatched String")
-    assert_view Minitest::Spec.spec_type(["Unmatched String", :view])
-    assert_view Minitest::Spec.spec_type(["Unmatched String", :helper])
+  end
+
+  def test_spec_type_resolves_for_additional_desc_view
+    assert_view Minitest::Spec.spec_type("Unmatched String", :view)
+    assert_view Minitest::Spec.spec_type("Unmatched String", :view, :other)
+    assert_view Minitest::Spec.spec_type("Unmatched String", :other, :view)
+  end
+
+  def test_spec_type_resolves_for_additional_desc_helper
+    assert_view Minitest::Spec.spec_type("Unmatched String", :helper)
+    assert_view Minitest::Spec.spec_type("Unmatched String", :helper, :other)
+    assert_view Minitest::Spec.spec_type("Unmatched String", :other, :helper)
   end
 end

data/test/rails/active_support/test_spec_type.rb

@@ -21,6 +21,8 @@ class TestActiveSupportSpecType < Minitest::Test
   end
 
   def test_spec_type_resolves_for_additional_desc_model
-    assert_support Minitest::Spec.spec_type(["Unmatched String", :model])
+    assert_support Minitest::Spec.spec_type("Unmatched String", :model)
+    assert_support Minitest::Spec.spec_type("Unmatched String", :model, :other)
+    assert_support Minitest::Spec.spec_type("Unmatched String", :other, :model)
   end
 end

data/test/rails/generators/test_spec_type.rb

@@ -32,4 +32,14 @@ class TestGeneratorsSpecType < Minitest::Test
     refute_generator Minitest::Spec.spec_type("Install Generator\fTest")
     refute_generator Minitest::Spec.spec_type("Install GeneratorXTest")
   end
+
+  def test_spec_type_doesnt_resolve_random_strings
+    refute_generator Minitest::Spec.spec_type("Unmatched String")
+  end
+
+  def test_spec_type_resolves_for_additional_desc_generator
+    assert_generator Minitest::Spec.spec_type("Unmatched String", :generator)
+    assert_generator Minitest::Spec.spec_type("Unmatched String", :generator, :other)
+    assert_generator Minitest::Spec.spec_type("Unmatched String", :other, :generator)
+  end
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: minitest-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Mike Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.3.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.3.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement