adjusting tests

Oleg committed Oct 05, 2011

commit 4ab539d35fe7a2424add5d97ea45a7a190d89dc8

Showing 3 changed files with 21 additions and 3 deletions

test/unit/models/file_test.rb +2 -2

@@	@@ -24,7 +24,7 @@ class CmsFileTest < ActiveSupport::TestCase
	assert_equal 'Image', file.label
	assert_equal 'image.jpg', file.file_file_name
	assert_equal 'image/jpeg', file.file_content_type
-	assert_equal 6400, file.file_file_size
+	assert file.file_file_size > 6000
	assert_equal 1, file.position
	end
	end
@@	@@ -38,7 +38,7 @@ class CmsFileTest < ActiveSupport::TestCase
	assert_equal 'Image', file.label
	assert_equal 'image.jpg', file.file_file_name
	assert_equal 'image/jpeg', file.file_content_type
-	assert_equal 3624, file.file_file_size
+	assert file.file_file_size < 6000
	assert_equal 1, file.position
	end
	end

test/unit/tags/page_file_test.rb +1 -1

@@	@@ -99,7 +99,7 @@ class PageFileTagTest < ActiveSupport::TestCase
	)
	file = Cms::File.last
	assert_equal 'image.jpg', file.file_file_name
-	assert_equal 3624, file.file_file_size
+	assert file.file_file_size < 6000
	end
	end

test/unit/tags/page_files_test.rb +18 -0

@@	@@ -78,4 +78,22 @@ class PageFilesTagTest < ActiveSupport::TestCase
	tag.render
	end

+	def test_content_and_render_with_dimentions
+	layout = cms_layouts(:default)
+	layout.update_attribute(:content, '{{ cms:page_files:file:image[10x10#] }}')
+	page = cms_pages(:default)
+
+	assert_difference 'Cms::File.count' do
+	page.update_attributes!(
+	:blocks_attributes => [
+	{ :label => 'file',
+	:content => fixture_file_upload('files/image.jpg') }
+	]
+	)
+	file = Cms::File.last
+	assert_equal 'image.jpg', file.file_file_name
+	assert file.file_file_size < 6000
+	end
+	end
+
	end
	\ No newline at end of file