aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2015-09-03 14:42:47 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2015-09-03 14:42:47 -0300
commit21d6eb3603ae20761b4118f4be256b78a5a4f78e (patch)
treead28518fa00a91eff2d74cbae5fa005217e59df9
parent0294c61359340892f0c38f57b203ba58edbc55e5 (diff)
parent3ee1f7b40b4064b15428ec54dc60e4d90c9a5d0b (diff)
downloadrails-21d6eb3603ae20761b4118f4be256b78a5a4f78e.tar.gz
rails-21d6eb3603ae20761b4118f4be256b78a5a4f78e.tar.bz2
rails-21d6eb3603ae20761b4118f4be256b78a5a4f78e.zip
Merge pull request #21481 from prakashlaxkar/remove_config
Removed unused config from activemodel test
-rw-r--r--activemodel/test/cases/helper.rb1
-rw-r--r--activemodel/test/config.rb3
2 files changed, 0 insertions, 4 deletions
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index 0cd80be66f..27fdbc739c 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -1,6 +1,5 @@
require File.expand_path('../../../../load_paths', __FILE__)
-require 'config'
require 'active_model'
require 'active_support/core_ext/string/access'
diff --git a/activemodel/test/config.rb b/activemodel/test/config.rb
deleted file mode 100644
index 0b577a9936..0000000000
--- a/activemodel/test/config.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-TEST_ROOT = File.expand_path(File.dirname(__FILE__))
-FIXTURES_ROOT = TEST_ROOT + "/fixtures"
-SCHEMA_FILE = TEST_ROOT + "/schema.rb"