fixing tests, only flunking now

Oleg committed Aug 31, 2010
commit af8d9f0967c33e152ec60f7b3843bad5725fa47c
Showing 6 changed files with 13 additions and 13 deletions
comfortable_mexican_sofa.rb b/lib/comfortable_mexican_sofa.rb +2 -2
@@ @@ -2,8 +2,8 @@ require File.expand_path('comfortable_mexican_sofa/cms_form_builder', File.dirna
require File.expand_path('../app/models/cms_block', File.dirname(__FILE__))
require File.expand_path('comfortable_mexican_sofa/cms_tag', File.dirname(__FILE__))
- Dir.glob(File.expand_path('comfortable_mexican_sofa/cms_tag/*.rb', File.dirname(__FILE__))).each do |tag|
- require tag
+ Dir.glob(File.expand_path('comfortable_mexican_sofa/cms_tag/*.rb', File.dirname(__FILE__))).each do |tag_path|
+ require tag_path
end
module ComfortableMexicanSofa
test/functional/cms_admin/layouts_controller_test.rb +2 -2
@@ @@ -14,7 +14,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
assert_response :success
assert assigns(:cms_layout)
assert_template :new
- assert_select 'form[action=/cms_admin/layouts]'
+ assert_select 'form[action=/cms-admin/layouts]'
end
def test_get_edit
@@ @@ -22,7 +22,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
assert_response :success
assert assigns(:cms_layout)
assert_template :edit
- assert_select "form[action=/cms_admin/layouts/#{cms_layouts(:default).id}]"
+ assert_select "form[action=/cms-admin/layouts/#{cms_layouts(:default).id}]"
end
def test_get_edit_failure
test/functional/cms_admin/pages_controller_test.rb +6 -6
@@ @@ -14,7 +14,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
assert_response :success
assert assigns(:cms_page)
assert_template :new
- assert_select 'form[action=/cms_admin/pages]'
+ assert_select 'form[action=/cms-admin/pages]'
end
def test_get_edit
@@ @@ -26,11 +26,11 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
end
def test_creation
- assert_difference 'CmsPage.count' do
- post :create, :cms_page => {
- :label => 'New Page'
- }
- end
+ # assert_difference 'CmsPage.count' do
+ # post :create, :cms_page => {
+ # :label => 'New Page'
+ # }
+ # end
flunk
end
test/unit/cms_tags/page_integer_test.rb +1 -1
@@ @@ -19,7 +19,7 @@ class PageIntegerTest < ActiveSupport::TestCase
def test_initialization_of_content_objects
content = cms_layouts(:default).content
- block = CmsTag::PageInteger.initialize_tag_objects(content).first
+ block = CmsTag::PageInteger.initialize_tag_objects(nil, content).first
assert_equal CmsTag::PageInteger, block.class
end
test/unit/cms_tags/page_string_test.rb +1 -1
@@ @@ -19,7 +19,7 @@ class PageStringTest < ActiveSupport::TestCase
def test_initialization_of_content_objects
content = cms_layouts(:default).content
- block = CmsTag::PageString.initialize_tag_objects(content).first
+ block = CmsTag::PageString.initialize_tag_objects(nil, content).first
assert_equal CmsTag::PageString, block.class
end
test/unit/cms_tags/page_text_test.rb +1 -1
@@ @@ -21,7 +21,7 @@ class PageTextTest < ActiveSupport::TestCase
def test_initialization_of_content_objects
content = cms_layouts(:default).content
- block = CmsTag::PageText.initialize_tag_objects(content).first
+ block = CmsTag::PageText.initialize_tag_objects(nil, content).first
assert_equal CmsTag::PageText, block.class
end