From cc45a358e627a219bd6625d0c3bc79664f10638c Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 3 Sep 2012 17:01:05 -0500 Subject: [PATCH] * fixed tests; setting default setting of 'public' for tests to false --- lib/jam_ruby/message_factory.rb | 2 +- lib/jam_ruby/models/jam_session.rb | 10 +++++----- spec/factories.rb | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/jam_ruby/message_factory.rb b/lib/jam_ruby/message_factory.rb index 6195ec3d5..e8845c892 100644 --- a/lib/jam_ruby/message_factory.rb +++ b/lib/jam_ruby/message_factory.rb @@ -14,7 +14,7 @@ module JamRuby Jampb::ClientMessage::Type.constants.each do |constant| @type_values[Jampb::ClientMessage::Type.const_get(constant)] = constant - end + end end diff --git a/lib/jam_ruby/models/jam_session.rb b/lib/jam_ruby/models/jam_session.rb index b0cb1cafc..718f63b2f 100644 --- a/lib/jam_ruby/models/jam_session.rb +++ b/lib/jam_ruby/models/jam_session.rb @@ -1,7 +1,7 @@ module JamRuby class JamSession < ActiveRecord::Base - self.primary_key = 'id' + self.primary_key = 'id' belongs_to :creator, :inverse_of => :jam_sessions, :class_name => "JamRuby::User", :foreign_key => "user_id" has_many :jam_session_members, :class_name => "JamRuby::JamSessionMember" @@ -9,12 +9,12 @@ module JamRuby # Verifies that the specified user can join this jam session def access?(user) - return self.users.exists? user + return self.public || self.users.exists?(user) end - def to_s - return name - end + def to_s + return name + end end end diff --git a/spec/factories.rb b/spec/factories.rb index 4e3d71480..fc4ec00ee 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -12,6 +12,7 @@ FactoryGirl.define do factory :jam_session, :class => JamRuby::JamSession do sequence(:name) { |n| "Jam Session #{n}" } + public false end factory :jam_session_member, :class => JamRuby::JamSessionMember do