Download as
Browse Code »

Commit 9ea639652a16d336eb029bbf2ca5f8c1031b8420

Authored by Leandro Santos
1 parent a6423fab
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

rails3: fix License unit tests

Showing 2 changed files with 6 additions and 4 deletions   Show diff stats
app/models/license.rb
  Diff comments   View file @9ea6396
@@ -14,6 +14,8 @@ class License < ActiveRecord::Base @@ -14,6 +14,8 @@ class License < ActiveRecord::Base
14 validates_presence_of :slug, :if => lambda {|license| license.name.present?} 14 validates_presence_of :slug, :if => lambda {|license| license.name.present?}
15 validates_uniqueness_of :slug, :scope => :environment_id 15 validates_uniqueness_of :slug, :scope => :environment_id
16 16
  17 + attr_accessible :environment, :slug
  18 +
17 before_validation do |license| 19 before_validation do |license|
18 license.slug ||= license.name.to_slug if license.name.present? 20 license.slug ||= license.name.to_slug if license.name.present?
19 end 21 end
test/unit/license_test.rb
  Diff comments   View file @9ea6396
@@ -4,14 +4,14 @@ class LicenseTest < ActiveSupport::TestCase @@ -4,14 +4,14 @@ class LicenseTest < ActiveSupport::TestCase
4 should 'validate presence of name and environment' do 4 should 'validate presence of name and environment' do
5 license = License.new 5 license = License.new
6 license.valid? 6 license.valid?
7 - assert license.errors.invalid?(:name)  
8 - assert license.errors.invalid?(:environment) 7 + assert license.errors[:name].any?
  8 + assert license.errors[:environment].any?
9 9
10 license.name = 'GPLv3' 10 license.name = 'GPLv3'
11 license.environment = Environment.default 11 license.environment = Environment.default
12 license.valid? 12 license.valid?
13 - assert !license.errors.invalid?(:name)  
14 - assert !license.errors.invalid?(:environment) 13 + assert !license.errors[:name].any?
  14 + assert !license.errors[:environment].any?
15 end 15 end
16 16
17 should 'fill in slug before creation' do 17 should 'fill in slug before creation' do