jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
r888888888
2013-05-07 13:27:21 -07:00
parent 2e370f9907
commit a031a4eba8
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/user_feedback.rb
View File

@@ -5,6 +5,7 @@ class UserFeedback < ActiveRecord::Base
before_validation :initialize_creator, :on => :create before_validation :initialize_creator, :on => :create
attr_accessible :body, :user_id, :category, :user_name attr_accessible :body, :user_id, :category, :user_name
validates_presence_of :user, :creator, :body, :category validates_presence_of :user, :creator, :body, :category
validates_inclusion_of :category, :in => %w(positive negative neutral)
validate :creator_is_gold validate :creator_is_gold
validate :user_is_not_creator validate :user_is_not_creator
after_create :create_dmail after_create :create_dmail

2
config/danbooru_default_config.rb
View File

@@ -4,7 +4,7 @@ module Danbooru
class Configuration class Configuration
# The version of this Danbooru. # The version of this Danbooru.
def version def version
"2.9.1" "2.10.0"
end end
# The name of this Danbooru. # The name of this Danbooru.

2
test/unit/artist_url_test.rb
View File

@@ -42,7 +42,7 @@ class ArtistUrlTest < ActiveSupport::TestCase
should "normalize pixiv urls" do should "normalize pixiv urls" do
url = FactoryGirl.create(:artist_url, :url => "http://img55.pixiv.net/img/monet") url = FactoryGirl.create(:artist_url, :url => "http://img55.pixiv.net/img/monet")
assert_equal("http://img55.pixiv.net/img/monet", url.url) assert_equal("http://img55.pixiv.net/img/monet", url.url)
assert_equal("http://img.pixiv.net/monet/", url.normalized_url) assert_equal("http://img.pixiv.net/img/monet/", url.normalized_url)
end end
end end
end end