Merge branch 'master' into erbout

2 files changed, 15 insertions, 15 deletions

diff --git a/activesupport/test/string_inquirer_test.rb b/activesupport/test/string_inquirer_test.rb
new file mode 100644
index 0000000000..dda7850e6b
--- /dev/null
+++ b/activesupport/test/string_inquirer_test.rb
@@ -0,0 +1,15 @@
+require 'abstract_unit'
+
+class StringInquirerTest < Test::Unit::TestCase
+  def test_match
+    assert ActiveSupport::StringInquirer.new("production").production?
+  end
+
+  def test_miss
+    assert !ActiveSupport::StringInquirer.new("production").development?
+  end
+
+  def test_missing_question_mark
+    assert_raises(NoMethodError) { ActiveSupport::StringInquirer.new("production").production }
+  end
+end
diff --git a/activesupport/test/string_questioneer_test.rb b/activesupport/test/string_questioneer_test.rb
deleted file mode 100644
index ff9d2c17f9..0000000000
--- a/activesupport/test/string_questioneer_test.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'abstract_unit'
-
-class StringQuestioneerTest < Test::Unit::TestCase
-  def test_match
-    assert StringQuestioneer.new("production").production?
-  end
-  
-  def test_miss
-    assert !StringQuestioneer.new("production").development?
-  end
-
-  def test_missing_question_mark
-    assert_raises(NoMethodError) { StringQuestioneer.new("production").production }
-  end
-end
\ No newline at end of file