From 402163916b0d65c33208f3ebf1a488dce93d7ad3 Mon Sep 17 00:00:00 2001
From: Stefan Sprenger <stefan.sprenger@dkd.de>
Date: Tue, 7 Jun 2011 09:33:17 +0200
Subject: Move test/engine/generators_test.rb to
test/railties/generators_test.rb
---
railties/test/engine/generators_test.rb | 90 -------------------------------
railties/test/railties/generators_test.rb | 90 +++++++++++++++++++++++++++++++
2 files changed, 90 insertions(+), 90 deletions(-)
delete mode 100644 railties/test/engine/generators_test.rb
create mode 100644 railties/test/railties/generators_test.rb
(limited to 'railties/test')
diff --git a/railties/test/engine/generators_test.rb b/railties/test/engine/generators_test.rb
deleted file mode 100644
index 4af315f696..0000000000
--- a/railties/test/engine/generators_test.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-require 'fileutils'
-
-require 'test/unit'
-require 'rubygems'
-
-# TODO: Remove setting this magic constant
-RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..")
-
-# These files do not require any others and are needed
-# to run the tests
-require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/isolation"
-require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/declarative"
-require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/core_ext/kernel/reporting"
-require "#{RAILS_FRAMEWORK_ROOT}/railties/lib/rails/generators/test_case"
-
-module EngineTests
- class GeneratorTest < Rails::Generators::TestCase
- include ActiveSupport::Testing::Isolation
-
- TMP_PATH = File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. tmp]))
- self.destination_root = File.join(TMP_PATH, "foo_bar")
-
- def tmp_path(*args)
- File.join(TMP_PATH, *args)
- end
-
- def engine_path
- tmp_path('foo_bar')
- end
-
- def bundled_rails(cmd)
- `bundle exec rails #{cmd}`
- end
-
- def rails(cmd)
- environment = File.expand_path('../../../../load_paths', __FILE__)
- if File.exist?("#{environment}.rb")
- require_environment = "-r #{environment}"
- end
- `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/bin/rails #{cmd}`
- end
-
- def build_engine
- FileUtils.mkdir_p(engine_path)
- FileUtils.rm_r(engine_path)
-
- rails("plugin new #{engine_path} --full --mountable")
-
- Dir.chdir(engine_path) do
- File.open("Gemfile", "w") do |f|
- f.write <<-GEMFILE.gsub(/^ {12}/, '')
- source "http://rubygems.org"
-
- gem 'rails', :path => '#{RAILS_FRAMEWORK_ROOT}'
- gem 'sqlite3'
-
- if RUBY_VERSION < '1.9'
- gem "ruby-debug", ">= 0.10.3"
- end
- GEMFILE
- end
- end
- end
-
- def setup
- build_engine
- end
-
- def test_controllers_are_correctly_namespaced
- Dir.chdir(engine_path) do
- bundled_rails("g controller topics")
- assert_file "app/controllers/foo_bar/topics_controller.rb", /FooBar::TopicsController/
- end
- end
-
- def test_models_are_correctly_namespaced
- Dir.chdir(engine_path) do
- bundled_rails("g model topic")
- assert_file "app/models/foo_bar/topic.rb", /FooBar::Topic/
- end
- end
-
- def test_helpers_are_correctly_namespaced
- Dir.chdir(engine_path) do
- bundled_rails("g helper topics")
- assert_file "app/helpers/foo_bar/topics_helper.rb", /FooBar::TopicsHelper/
- end
- end
- end
-end
diff --git a/railties/test/railties/generators_test.rb b/railties/test/railties/generators_test.rb
new file mode 100644
index 0000000000..e32970c2e5
--- /dev/null
+++ b/railties/test/railties/generators_test.rb
@@ -0,0 +1,90 @@
+require 'fileutils'
+
+require 'test/unit'
+require 'rubygems'
+
+# TODO: Remove setting this magic constant
+RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..")
+
+# These files do not require any others and are needed
+# to run the tests
+require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/isolation"
+require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/declarative"
+require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/core_ext/kernel/reporting"
+require "#{RAILS_FRAMEWORK_ROOT}/railties/lib/rails/generators/test_case"
+
+module RailtiesTests
+ class GeneratorTest < Rails::Generators::TestCase
+ include ActiveSupport::Testing::Isolation
+
+ TMP_PATH = File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. tmp]))
+ self.destination_root = File.join(TMP_PATH, "foo_bar")
+
+ def tmp_path(*args)
+ File.join(TMP_PATH, *args)
+ end
+
+ def engine_path
+ tmp_path('foo_bar')
+ end
+
+ def bundled_rails(cmd)
+ `bundle exec rails #{cmd}`
+ end
+
+ def rails(cmd)
+ environment = File.expand_path('../../../../load_paths', __FILE__)
+ if File.exist?("#{environment}.rb")
+ require_environment = "-r #{environment}"
+ end
+ `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/bin/rails #{cmd}`
+ end
+
+ def build_engine
+ FileUtils.mkdir_p(engine_path)
+ FileUtils.rm_r(engine_path)
+
+ rails("plugin new #{engine_path} --full --mountable")
+
+ Dir.chdir(engine_path) do
+ File.open("Gemfile", "w") do |f|
+ f.write <<-GEMFILE.gsub(/^ {12}/, '')
+ source "http://rubygems.org"
+
+ gem 'rails', :path => '#{RAILS_FRAMEWORK_ROOT}'
+ gem 'sqlite3'
+
+ if RUBY_VERSION < '1.9'
+ gem "ruby-debug", ">= 0.10.3"
+ end
+ GEMFILE
+ end
+ end
+ end
+
+ def setup
+ build_engine
+ end
+
+ def test_controllers_are_correctly_namespaced
+ Dir.chdir(engine_path) do
+ bundled_rails("g controller topics")
+ assert_file "app/controllers/foo_bar/topics_controller.rb", /FooBar::TopicsController/
+ end
+ end
+
+ def test_models_are_correctly_namespaced
+ Dir.chdir(engine_path) do
+ bundled_rails("g model topic")
+ assert_file "app/models/foo_bar/topic.rb", /FooBar::Topic/
+ end
+ end
+
+ def test_helpers_are_correctly_namespaced
+ Dir.chdir(engine_path) do
+ bundled_rails("g helper topics")
+ assert_file "app/helpers/foo_bar/topics_helper.rb", /FooBar::TopicsHelper/
+ end
+ end
+ end
+end
--
cgit v1.2.3