From 12034a6e00ad647d0ecde01f3a314a6031501d9c Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Tue, 12 Jul 2011 00:22:42 -0400 Subject: [PATCH] Ownership does not have to generate a token anymore --- app/models/ownership.rb | 6 ------ test/unit/ownership_test.rb | 10 ---------- 2 files changed, 16 deletions(-) diff --git a/app/models/ownership.rb b/app/models/ownership.rb index 36f24db1747..30e2014235f 100644 --- a/app/models/ownership.rb +++ b/app/models/ownership.rb @@ -4,13 +4,8 @@ class Ownership < ActiveRecord::Base validates :user_id, :uniqueness => {:scope => :rubygem_id} - before_create :generate_token before_destroy :keep_last_owner - def generate_token - self.token = ActiveSupport::SecureRandom.hex - end - def keep_last_owner if rubygem.owners.count == 1 errors[:base] << "Can't delete last owner of a gem." @@ -19,5 +14,4 @@ def keep_last_owner true end end - end diff --git a/test/unit/ownership_test.rb b/test/unit/ownership_test.rb index c5be96e41ee..4676e037984 100644 --- a/test/unit/ownership_test.rb +++ b/test/unit/ownership_test.rb @@ -1,7 +1,6 @@ require 'test_helper' class OwnershipTest < ActiveSupport::TestCase - should "be valid with factory" do assert_valid Factory.build(:ownership) end @@ -20,14 +19,6 @@ class OwnershipTest < ActiveSupport::TestCase subject { @ownership } should validate_uniqueness_of(:user_id).scoped_to(:rubygem_id) - - should "create token" do - assert_not_nil @ownership.token - end - - should "have a 32 character hexadecimal api key" do - assert @ownership.token =~ /[a-z0-9]{32}/ - end end context "with multiple ownerships on the same rubygem" do @@ -49,5 +40,4 @@ class OwnershipTest < ActiveSupport::TestCase assert_equal "Can't delete last owner of a gem.", @ownership_two.errors[:base].first end end - end