adjusting tests so they run under ruby 1.9
Oleg
committed Dec 28, 2010
commit 80b6f485d2c6daeadda66e879fd39a865cac99e2
Showing 17
changed files with
18 additions
and 18 deletions
test/functional/cms_admin/layouts_controller_test.rb
+1
-1
| @@ | @@ -1,4 +1,4 @@ |
| - | require File.dirname(__FILE__) + '/../../test_helper' |
| + | require File.expand_path('../../test_helper', File.dirname(__FILE__)) |
| class CmsAdmin::LayoutsControllerTest < ActionController::TestCase | |
test/functional/cms_admin/pages_controller_test.rb
+1
-1
| @@ | @@ -1,4 +1,4 @@ |
| - | require File.dirname(__FILE__) + '/../../test_helper' |
| + | require File.expand_path('../../test_helper', File.dirname(__FILE__)) |
| class CmsAdmin::PagesControllerTest < ActionController::TestCase | |
test/functional/cms_admin/sites_controller_test.rb
+1
-1
| @@ | @@ -1,4 +1,4 @@ |
| - | require File.dirname(__FILE__) + '/../../test_helper' |
| + | require File.expand_path('../../test_helper', File.dirname(__FILE__)) |
| class CmsAdmin::SitesControllerTest < ActionController::TestCase | |
test/functional/cms_admin/snippets_controller_test.rb
+1
-1
| @@ | @@ -1,4 +1,4 @@ |
| - | require File.dirname(__FILE__) + '/../../test_helper' |
| + | require File.expand_path('../../test_helper', File.dirname(__FILE__)) |
| class CmsAdmin::SnippetsControllerTest < ActionController::TestCase | |
test/functional/cms_admin/uploads_controller_test.rb
+1
-1
| @@ | @@ -1,4 +1,4 @@ |
| - | require 'test_helper' |
| + | require File.expand_path('../../test_helper', File.dirname(__FILE__)) |
| class CmsAdmin::UploadsControllerTest < ActionController::TestCase | |
test/functional/cms_content_controller_test.rb
+1
-1
| @@ | @@ -1,4 +1,4 @@ |
| - | require File.dirname(__FILE__) + '/../test_helper' |
| + | require File.expand_path('../test_helper', File.dirname(__FILE__)) |
| class CmsContentControllerTest < ActionController::TestCase | |
test/integration/authentication_test.rb
+1
-1
| @@ | @@ -1,4 +1,4 @@ |
| - | require File.dirname(__FILE__) + '/../test_helper' |
| + | require File.expand_path('../test_helper', File.dirname(__FILE__)) |
| class AuthenticationTest < ActionDispatch::IntegrationTest | |
test/integration/rake_tasks_test.rb
+1
-1
| @@ | @@ -1,4 +1,4 @@ |
| - | require File.dirname(__FILE__) + '/../test_helper' |
| + | require File.expand_path('../test_helper', File.dirname(__FILE__)) |
| require 'rake' | |
| require 'rake/rdoctask' | |
test/integration/render_cms_seed_test.rb
+1
-1
| @@ | @@ -1,4 +1,4 @@ |
| - | require File.dirname(__FILE__) + '/../test_helper' |
| + | require File.expand_path('../test_helper', File.dirname(__FILE__)) |
| class RenderCmsSeedTest < ActionDispatch::IntegrationTest | |
test/integration/render_cms_test.rb
+1
-1
| @@ | @@ -1,4 +1,4 @@ |
| - | require File.dirname(__FILE__) + '/../test_helper' |
| + | require File.expand_path('../test_helper', File.dirname(__FILE__)) |
| class RenderCmsTest < ActionDispatch::IntegrationTest | |
test/integration/sites_test.rb
+1
-1
| @@ | @@ -1,4 +1,4 @@ |
| - | require File.dirname(__FILE__) + '/../test_helper' |
| + | require File.expand_path('../test_helper', File.dirname(__FILE__)) |
| class SitesTest < ActionDispatch::IntegrationTest | |
test/integration/view_hooks_test.rb
+1
-1
| @@ | @@ -1,4 +1,4 @@ |
| - | require File.dirname(__FILE__) + '/../test_helper' |
| + | require File.expand_path('../test_helper', File.dirname(__FILE__)) |
| class ViewHooksTest < ActionDispatch::IntegrationTest | |
test/unit/cms_block_test.rb
+1
-1
| @@ | @@ -4,7 +4,7 @@ class CmsBlockTest < ActiveSupport::TestCase |
| def test_fixtures_validity | |
| CmsBlock.all.each do |block| | |
| - | assert block.valid?, block.errors.full_messages |
| + | assert block.valid?, block.errors.full_messages.to_s |
| end | |
| end | |
test/unit/cms_layout_test.rb
+1
-1
| @@ | @@ -4,7 +4,7 @@ class CmsLayoutTest < ActiveSupport::TestCase |
| def test_fixtures_validity | |
| CmsLayout.all.each do |layout| | |
| - | assert layout.valid? |
| + | assert layout.valid?, layout.errors.full_messages.to_s |
| end | |
| end | |
test/unit/cms_page_test.rb
+2
-2
| @@ | @@ -4,7 +4,7 @@ class CmsPageTest < ActiveSupport::TestCase |
| def test_fixtures_validity | |
| CmsPage.all.each do |page| | |
| - | assert page.valid?, page.errors.full_messages |
| + | assert page.valid?, page.errors.full_messages.to_s |
| assert_equal page.read_attribute(:content), page.content(true) | |
| end | |
| end | |
| @@ | @@ -19,7 +19,7 @@ class CmsPageTest < ActiveSupport::TestCase |
| def test_validation_of_parent_presence | |
| page = cms_sites(:default).cms_pages.new(new_params) | |
| assert !page.parent | |
| - | assert page.valid?, page.errors.full_messages |
| + | assert page.valid?, page.errors.full_messages.to_s |
| assert_equal cms_pages(:default), page.parent | |
| end | |
test/unit/cms_site_test.rb
+1
-1
| @@ | @@ -4,7 +4,7 @@ class CmsSiteTest < ActiveSupport::TestCase |
| def test_fixtures_validity | |
| CmsSite.all.each do |site| | |
| - | assert site.valid?, site.errors.full_messages |
| + | assert site.valid?, site.errors.full_messages.to_s |
| end | |
| end | |
test/unit/cms_snippet_test.rb
+1
-1
| @@ | @@ -4,7 +4,7 @@ class CmsSnippetTest < ActiveSupport::TestCase |
| def test_fixtures_validity | |
| CmsSnippet.all.each do |snippet| | |
| - | assert snippet.valid?, snippet.errors.full_messages |
| + | assert snippet.valid?, snippet.errors.full_messages.to_s |
| end | |
| end | |