From a031a4eba840254046c787ebd4d7961728b44c75 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Tue, 7 May 2013 13:27:21 -0700 Subject: [PATCH] fix test --- app/models/user_feedback.rb | 1 + config/danbooru_default_config.rb | 2 +- test/unit/artist_url_test.rb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/user_feedback.rb b/app/models/user_feedback.rb index 796d34a01..111a21eff 100644 --- a/app/models/user_feedback.rb +++ b/app/models/user_feedback.rb @@ -5,6 +5,7 @@ class UserFeedback < ActiveRecord::Base before_validation :initialize_creator, :on => :create attr_accessible :body, :user_id, :category, :user_name validates_presence_of :user, :creator, :body, :category + validates_inclusion_of :category, :in => %w(positive negative neutral) validate :creator_is_gold validate :user_is_not_creator after_create :create_dmail diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb index e13148345..44c65a979 100644 --- a/config/danbooru_default_config.rb +++ b/config/danbooru_default_config.rb @@ -4,7 +4,7 @@ module Danbooru class Configuration # The version of this Danbooru. def version - "2.9.1" + "2.10.0" end # The name of this Danbooru. diff --git a/test/unit/artist_url_test.rb b/test/unit/artist_url_test.rb index aaeb62112..9339f98e5 100644 --- a/test/unit/artist_url_test.rb +++ b/test/unit/artist_url_test.rb @@ -42,7 +42,7 @@ class ArtistUrlTest < ActiveSupport::TestCase should "normalize pixiv urls" do 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://img.pixiv.net/monet/", url.normalized_url) + assert_equal("http://img.pixiv.net/img/monet/", url.normalized_url) end end end