Merge pull request #183 from acmetech/master

revert 36a8c17
socializer · Feb 4, 2014 · 974b488 · 974b488
2 parents b6428b5 + 74aa970
commit 974b488
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/models/socializer/audience.rb b/app/models/socializer/audience.rb
@@ -9,7 +9,7 @@ class Audience < ActiveRecord::Base
     belongs_to :activity
     belongs_to :activity_object
 
-    validates :activity_id, presence: true, uniqueness: { scope: :activity_object_id }
+    # validates :activity_id, presence: true, uniqueness: { scope: :activity_object_id }
     validates :privacy_level, presence: true
 
     def object

diff --git a/spec/models/socializer/audience_spec.rb b/spec/models/socializer/audience_spec.rb
@@ -20,7 +20,8 @@ module Socializer
 
     context 'validations' do
       it { expect(audience).to validate_presence_of(:privacy_level) }
-      it { expect(create(:socializer_audience)).to validate_uniqueness_of(:activity_id).scoped_to(:activity_object_id) }
+      # it { expect(audience).to validate_presence_of(:activity_id) }
+      # it { expect(create(:socializer_audience)).to validate_uniqueness_of(:activity_id).scoped_to(:activity_object_id) }
     end
 
     it { expect(enumerize(:privacy_level).in(:public, :circles, :limited).with_default(:public)) }