From c45f744bb05698e72d540f158cae0ad1b0f2627f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kazimierz=20Kie=C5=82kowicz?= Date: Wed, 7 Dec 2011 17:31:31 +0100 Subject: [PATCH] Move rake notes test to railties/test/application/rake/notes_test.rb --- railties/test/application/rake/notes_test.rb | 45 ++++++++++++++++++++ railties/test/railties/rake_tasks_test.rb | 42 ------------------ 2 files changed, 45 insertions(+), 42 deletions(-) create mode 100644 railties/test/application/rake/notes_test.rb delete mode 100644 railties/test/railties/rake_tasks_test.rb diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb new file mode 100644 index 0000000000..659cbfec0f --- /dev/null +++ b/railties/test/application/rake/notes_test.rb @@ -0,0 +1,45 @@ +require "isolation/abstract_unit" + +module ApplicationTests + module RakeTests + class RakeNotesTest < Test::Unit::TestCase + def setup + build_app + require "rails/all" + end + + def teardown + teardown_app + end + + test 'notes' do + + app_file "app/views/home/index.html.erb", "<% # TODO: note in erb %>" + app_file "app/views/home/index.html.haml", "-# TODO: note in haml" + app_file "app/views/home/index.html.slim", "/ TODO: note in slim" + + boot_rails + require 'rake' + require 'rdoc/task' + require 'rake/testtask' + + Rails.application.load_tasks + + Dir.chdir(app_path) do + output = `bundle exec rake notes` + + assert_match /note in erb/, output + assert_match /note in haml/, output + assert_match /note in slim/, output + end + + end + + private + def boot_rails + super + require "#{app_path}/config/environment" + end + end + end +end diff --git a/railties/test/railties/rake_tasks_test.rb b/railties/test/railties/rake_tasks_test.rb deleted file mode 100644 index 76d6ca8b5a..0000000000 --- a/railties/test/railties/rake_tasks_test.rb +++ /dev/null @@ -1,42 +0,0 @@ -require "isolation/abstract_unit" - -module RailtiesTest - class RakeNotesTest < Test::Unit::TestCase - def setup - build_app - require "rails/all" - end - - def teardown - teardown_app - end - - test 'notes' do - app_file "app/views/home/index.html.erb", "<% # TODO: note in erb %>" - app_file "app/views/home/index.html.haml", "-# TODO: note in haml" - app_file "app/views/home/index.html.slim", "/ TODO: note in slim" - - boot_rails - require 'rake' - require 'rdoc/task' - require 'rake/testtask' - - Rails.application.load_tasks - - Dir.chdir(app_path) do - output = `bundle exec rake notes` - - assert_match /note in erb/, output - assert_match /note in haml/, output - assert_match /note in slim/, output - end - - end - - private - def boot_rails - super - require "#{app_path}/config/environment" - end - end -end