fix tests

This commit is contained in:
r888888888 2015-07-06 18:32:35 -07:00
parent 0a5f1b53ba
commit 8ef7462b6b
6 changed files with 3035 additions and 2968 deletions

View File

@ -845,7 +845,8 @@ CREATE TABLE comments (
updated_at timestamp without time zone,
updater_id integer,
updater_ip_addr inet,
do_not_bump_post boolean DEFAULT false NOT NULL
do_not_bump_post boolean DEFAULT false NOT NULL,
is_deleted boolean DEFAULT false NOT NULL
);
@ -7262,3 +7263,5 @@ INSERT INTO schema_migrations (version) VALUES ('20150623191904');
INSERT INTO schema_migrations (version) VALUES ('20150629235905');
INSERT INTO schema_migrations (version) VALUES ('20150705014135');

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -108,7 +108,7 @@ class PoolTest < ActiveSupport::TestCase
end
should "add the pool to the post" do
assert_equal("pool:#{@pool.id}", @p1.pool_string)
assert_equal("pool:#{@pool.id} pool:series", @p1.pool_string)
end
should "increment the post count" do
@ -125,7 +125,7 @@ class PoolTest < ActiveSupport::TestCase
end
should "not double add the pool to the post" do
assert_equal("pool:#{@pool.id}", @p1.pool_string)
assert_equal("pool:#{@pool.id} pool:series", @p1.pool_string)
end
should "not double increment the post count" do
@ -190,7 +190,7 @@ class PoolTest < ActiveSupport::TestCase
end
should "not affect the post" do
assert_equal("pool:#{@pool.id}", @p1.pool_string)
assert_equal("pool:#{@pool.id} pool:series", @p1.pool_string)
end
should "not affect the post count" do
@ -271,7 +271,7 @@ class PoolTest < ActiveSupport::TestCase
@p2.reload
@p3.reload
assert_equal("", @p1.pool_string)
assert_equal("pool:#{@pool.id}", @p2.pool_string)
assert_equal("pool:#{@pool.id} pool:series", @p2.pool_string)
assert_equal("", @p3.pool_string)
end
end

View File

@ -511,7 +511,7 @@ class PostTest < ActiveSupport::TestCase
@post.reload
@pool.reload
assert_equal("#{@post.id}", @pool.post_ids)
assert_equal("pool:#{@pool.id}", @post.pool_string)
assert_equal("pool:#{@pool.id} pool:series", @post.pool_string)
end
end
@ -542,7 +542,7 @@ class PostTest < ActiveSupport::TestCase
@post.reload
@pool.reload
assert_equal("#{@post.id}", @pool.post_ids)
assert_equal("pool:#{@pool.id}", @post.pool_string)
assert_equal("pool:#{@pool.id} pool:series", @post.pool_string)
end
end
@ -557,7 +557,7 @@ class PostTest < ActiveSupport::TestCase
@post.reload
@pool.reload
assert_equal("#{@post.id}", @pool.post_ids)
assert_equal("pool:#{@pool.id}", @post.pool_string)
assert_equal("pool:#{@pool.id} pool:series", @post.pool_string)
end
end
@ -568,7 +568,7 @@ class PostTest < ActiveSupport::TestCase
@post.reload
assert_not_nil(@pool)
assert_equal("#{@post.id}", @pool.post_ids)
assert_equal("pool:#{@pool.id}", @post.pool_string)
assert_equal("pool:#{@pool.id} pool:series", @post.pool_string)
end
end
end
@ -1057,10 +1057,10 @@ class PostTest < ActiveSupport::TestCase
pool = FactoryGirl.create(:pool)
post.add_pool!(pool)
post.reload
assert_equal("pool:#{pool.id}", post.pool_string)
assert_equal("pool:#{pool.id} pool:series", post.pool_string)
post.add_pool!(pool)
post.reload
assert_equal("pool:#{pool.id}", post.pool_string)
assert_equal("pool:#{pool.id} pool:series", post.pool_string)
post.remove_pool!(pool)
post.reload
assert_equal("", post.pool_string)

View File

@ -31,8 +31,8 @@ module Sources
end
should "get the image url" do
assert_equal("http://lohas.nicoseiga.jp/priv/6dadd39237a6b8d3ab0ba85c0651ffab66e57711/1433298875/4937663", @site_1.image_url)
assert_equal("http://lohas.nicoseiga.jp/priv/0295d92ed5e468ab1b440da6697bb030e5061a3f/1433298877/4937663", @site_2.image_url)
assert_equal("http://lohas.nicoseiga.jp/priv/2da967039fd50a09c634dba26c1162ecf1c35ef7/1436234417/4937663", @site_1.image_url)
assert_equal("http://lohas.nicoseiga.jp/priv/ee9cb45867d86771abf4ba90c74de07bdc4c7e1a/1436234419/4937663", @site_2.image_url)
end
should "get the tags" do