From 22bc12ec374b8bdeb3818ca0a3eb787dd3ce39d8 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sun, 8 Jul 2012 10:54:21 -0700
Subject: minitest provides "it" and "describe"

Remove rails implementation of describe, alias "test" to "it"
---
 activesupport/lib/active_support/test_case.rb      |  6 ++--
 .../lib/active_support/testing/declarative.rb      | 40 ----------------------
 2 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 activesupport/lib/active_support/testing/declarative.rb

(limited to 'activesupport/lib/active_support')

diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index 307c53eac3..b6afeda966 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -3,7 +3,6 @@ require 'minitest/spec'
 require 'active_support/testing/setup_and_teardown'
 require 'active_support/testing/assertions'
 require 'active_support/testing/deprecation'
-require 'active_support/testing/declarative'
 require 'active_support/testing/isolation'
 require 'active_support/testing/mocha_module'
 require 'active_support/core_ext/kernel/reporting'
@@ -35,7 +34,10 @@ module ActiveSupport
     include ActiveSupport::Testing::SetupAndTeardown
     include ActiveSupport::Testing::Assertions
     include ActiveSupport::Testing::Deprecation
-    extend ActiveSupport::Testing::Declarative
+
+    class << self
+      alias :test :it
+    end
 
     # test/unit backwards compatibility methods
     alias :assert_raise :assert_raises
diff --git a/activesupport/lib/active_support/testing/declarative.rb b/activesupport/lib/active_support/testing/declarative.rb
deleted file mode 100644
index 508e37254a..0000000000
--- a/activesupport/lib/active_support/testing/declarative.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-module ActiveSupport
-  module Testing
-    module Declarative
-
-      def self.extended(klass) #:nodoc:
-        klass.class_eval do
-
-          unless method_defined?(:describe)
-            def self.describe(text)
-              class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-                def self.name
-                  "#{text}"
-                end
-              RUBY_EVAL
-            end
-          end
-
-        end
-      end
-
-      unless defined?(Spec)
-        # test "verify something" do
-        #   ...
-        # end
-        def test(name, &block)
-          test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
-          defined = instance_method(test_name) rescue false
-          raise "#{test_name} is already defined in #{self}" if defined
-          if block_given?
-            define_method(test_name, &block)
-          else
-            define_method(test_name) do
-              flunk "No implementation provided for #{name}"
-            end
-          end
-        end
-      end
-    end
-  end
-end
-- 
cgit v1.2.3