updated advertisement test
This commit is contained in:
@@ -74,7 +74,7 @@ class Advertisement < ActiveRecord::Base
|
|||||||
if width > 100 || height > 100
|
if width > 100 || height > 100
|
||||||
if height < width
|
if height < width
|
||||||
ratio = 100.0 / width
|
ratio = 100.0 / width
|
||||||
return (height * ratio)
|
return (height * ratio).to_i
|
||||||
else
|
else
|
||||||
return 100
|
return 100
|
||||||
end
|
end
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB |
@@ -2,15 +2,27 @@ require 'test_helper'
|
|||||||
|
|
||||||
class AdvertisementTest < ActiveSupport::TestCase
|
class AdvertisementTest < ActiveSupport::TestCase
|
||||||
context "An advertisement" do
|
context "An advertisement" do
|
||||||
|
setup do
|
||||||
|
@ad = Factory.create(:advertisement, :file => upload_jpeg("#{Rails.root}/test/files/test.jpg"))
|
||||||
|
end
|
||||||
|
|
||||||
|
teardown do
|
||||||
|
FileUtils.rm_f(Dir.glob("#{Rails.root}/public/images/advertisements/*.jpg"))
|
||||||
|
end
|
||||||
|
|
||||||
should "create new hit records" do
|
should "create new hit records" do
|
||||||
ad = Factory.create(:advertisement)
|
|
||||||
assert_difference("AdvertisementHit.count") do
|
assert_difference("AdvertisementHit.count") do
|
||||||
ad.hit!("0.0.0.0")
|
@ad.hit!("0.0.0.0")
|
||||||
end
|
end
|
||||||
assert_equal("0.0.0.0", AdvertisementHit.first.ip_addr)
|
assert_equal("0.0.0.0", AdvertisementHit.first.ip_addr)
|
||||||
assert_equal(1, AdvertisementHit.first.advertisement_id)
|
assert_equal(1, AdvertisementHit.first.advertisement_id)
|
||||||
assert_equal(1, ad.hit_sum(1.day.ago, 1.day.from_now))
|
assert_equal(1, @ad.hit_sum(1.day.ago, 1.day.from_now))
|
||||||
assert_equal(0, ad.hit_sum(2.days.ago, 1.day.ago))
|
assert_equal(0, @ad.hit_sum(2.days.ago, 1.day.ago))
|
||||||
|
end
|
||||||
|
|
||||||
|
should "know its preview height and preview width" do
|
||||||
|
assert_equal(100, @ad.preview_width)
|
||||||
|
assert_equal(67, @ad.preview_height)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user