* Removed Pixa/Tinami sources

* Upgraded to Rails 3.2.3
* Fixed tests
This commit is contained in:
albert
2012-06-01 19:22:58 -04:00
parent 105cba5963
commit 17881068e1
124 changed files with 1063 additions and 1214 deletions

View File

@@ -4,7 +4,7 @@ class BanTest < ActiveSupport::TestCase
context "A ban" do
context "created by an admin" do
setup do
@banner = Factory.create(:admin_user)
@banner = FactoryGirl.create(:admin_user)
CurrentUser.user = @banner
CurrentUser.ip_addr = "127.0.0.1"
end
@@ -16,38 +16,38 @@ class BanTest < ActiveSupport::TestCase
end
should "not be valid against another admin" do
user = Factory.create(:admin_user)
ban = Factory.build(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:admin_user)
ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
ban.save
assert(ban.errors.any?)
end
should "be valid against anyone who is not an admin" do
user = Factory.create(:moderator_user)
ban = Factory.create(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:moderator_user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
user = Factory.create(:janitor_user)
ban = Factory.create(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:janitor_user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
user = Factory.create(:contributor_user)
ban = Factory.create(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:contributor_user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
user = Factory.create(:privileged_user)
ban = Factory.create(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:privileged_user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
user = Factory.create(:user)
ban = Factory.create(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
end
end
context "created by a moderator" do
setup do
@banner = Factory.create(:moderator_user)
@banner = FactoryGirl.create(:moderator_user)
CurrentUser.user = @banner
CurrentUser.ip_addr = "127.0.0.1"
end
@@ -59,39 +59,39 @@ class BanTest < ActiveSupport::TestCase
end
should "not be valid against an admin or moderator" do
user = Factory.create(:admin_user)
ban = Factory.build(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:admin_user)
ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
ban.save
assert(ban.errors.any?)
user = Factory.create(:moderator_user)
ban = Factory.build(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:moderator_user)
ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
ban.save
assert(ban.errors.any?)
end
should "be valid against anyone who is not an admin or a moderator" do
user = Factory.create(:janitor_user)
ban = Factory.create(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:janitor_user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
user = Factory.create(:contributor_user)
ban = Factory.create(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:contributor_user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
user = Factory.create(:privileged_user)
ban = Factory.create(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:privileged_user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
user = Factory.create(:user)
ban = Factory.create(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:user)
ban = FactoryGirl.create(:ban, :user => user, :banner => @banner)
assert(ban.errors.empty?)
end
end
context "created by a janitor" do
setup do
@banner = Factory.create(:janitor_user)
@banner = FactoryGirl.create(:janitor_user)
CurrentUser.user = @banner
CurrentUser.ip_addr = "127.0.0.1"
end
@@ -103,53 +103,53 @@ class BanTest < ActiveSupport::TestCase
end
should "always be invalid" do
user = Factory.create(:admin_user)
ban = Factory.build(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:admin_user)
ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
ban.save
assert(ban.errors.any?)
user = Factory.create(:moderator_user)
ban = Factory.build(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:moderator_user)
ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
ban.save
assert(ban.errors.any?)
user = Factory.create(:janitor_user)
ban = Factory.build(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:janitor_user)
ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
ban.save
assert(ban.errors.any?)
user = Factory.create(:contributor_user)
ban = Factory.build(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:contributor_user)
ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
ban.save
assert(ban.errors.any?)
user = Factory.create(:privileged_user)
ban = Factory.build(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:privileged_user)
ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
ban.save
assert(ban.errors.any?)
user = Factory.create(:user)
ban = Factory.build(:ban, :user => user, :banner => @banner)
user = FactoryGirl.create(:user)
ban = FactoryGirl.build(:ban, :user => user, :banner => @banner)
ban.save
assert(ban.errors.any?)
end
end
should "initialize the expiration date" do
user = Factory.create(:user)
admin = Factory.create(:admin_user)
user = FactoryGirl.create(:user)
admin = FactoryGirl.create(:admin_user)
CurrentUser.user = admin
ban = Factory.create(:ban, :user => user, :banner => admin)
ban = FactoryGirl.create(:ban, :user => user, :banner => admin)
CurrentUser.user = nil
assert_not_nil(ban.expires_at)
end
should "update the user's feedback" do
user = Factory.create(:user)
admin = Factory.create(:admin_user)
user = FactoryGirl.create(:user)
admin = FactoryGirl.create(:admin_user)
assert(user.feedback.empty?)
CurrentUser.user = admin
ban = Factory.create(:ban, :user => user, :banner => admin)
ban = FactoryGirl.create(:ban, :user => user, :banner => admin)
CurrentUser.user = nil
assert(!user.feedback.empty?)
assert_equal("negative", user.feedback.last.category)
@@ -159,10 +159,10 @@ class BanTest < ActiveSupport::TestCase
context "Searching for a ban" do
context "by user id" do
setup do
@admin = Factory.create(:admin_user)
@admin = FactoryGirl.create(:admin_user)
CurrentUser.user = @admin
CurrentUser.ip_addr = "127.0.0.1"
@user = Factory.create(:user)
@user = FactoryGirl.create(:user)
end
teardown do
@@ -172,7 +172,7 @@ class BanTest < ActiveSupport::TestCase
context "when only expired bans exist" do
setup do
@ban = Factory.create(:ban, :user => @user, :banner => @admin, :duration => -1)
@ban = FactoryGirl.create(:ban, :user => @user, :banner => @admin, :duration => -1)
end
should "not return expired bans" do
@@ -182,7 +182,7 @@ class BanTest < ActiveSupport::TestCase
context "when active bans still exist" do
setup do
@ban = Factory.create(:ban, :user => @user, :banner => @admin, :duration => 1)
@ban = FactoryGirl.create(:ban, :user => @user, :banner => @admin, :duration => 1)
end
should "return active bans" do