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

fixes #3724

Browse Source
This commit is contained in:
Albert Yi
2018-05-24 10:24:14 -07:00
parent 3f40929ca1
commit b7c4df2df0
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/artist_url.rb
View File

@@ -2,7 +2,7 @@ class ArtistUrl < ApplicationRecord
before_validation :parse_prefix before_validation :parse_prefix
before_save :initialize_normalized_url, on: [ :create ] before_save :initialize_normalized_url, on: [ :create ]
before_save :normalize before_save :normalize
validates_presence_of :url validates :url, presence: true, uniqueness: true
validate :validate_url_format validate :validate_url_format
belongs_to :artist, :touch => true belongs_to :artist, :touch => true

7
test/unit/artist_test.rb
View File

@@ -35,6 +35,13 @@ class ArtistTest < ActiveSupport::TestCase
refute(@artist.urls[0].is_active?) refute(@artist.urls[0].is_active?)
end end
should "not allow duplicate active+inactive urls" do
@artist = Artist.create(name: "blah", url_string: "-http://monet.com\nhttp://monet.com")
assert_equal(1, @artist.urls.count)
assert_equal(["-http://monet.com"], @artist.urls.map(&:to_s))
refute(@artist.urls[0].is_active?)
end
should "should have a valid name" do should "should have a valid name" do
@artist = Artist.new(:name => "-blah") @artist = Artist.new(:name => "-blah")
@artist.save @artist.save