From 091998c20006e3c383fdc0492720b6c93a39efc9 Mon Sep 17 00:00:00 2001 From: Bert Owen Date: Fri, 16 May 2014 01:22:21 +0800 Subject: [PATCH] * fix music_session test --- ruby/lib/jam_ruby/models/music_session.rb | 12 ++++++------ ruby/spec/factories.rb | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index 22671b32d..5f72ecc57 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -1,6 +1,11 @@ module JamRuby class MusicSession < ActiveRecord::Base + NO_RECURRING = 'once' + RECURRING_WEEKLY = 'weekly' + + RECURRING_MODES = [NO_RECURRING, RECURRING_WEEKLY] + attr_accessor :legal_terms, :recurring_mode self.table_name = "music_sessions" @@ -34,7 +39,7 @@ module JamRuby validates :musician_access, :inclusion => {:in => [true, false]} validates :legal_terms, :inclusion => {:in => [true]}, :on => :create validates :creator, :presence => true - validates :recurring_mode, :inclusion => {:in => RECURRING_MODES} + validates :recurring_mode, :inclusion => {:in => RECURRING_MODES}, :on => :create validate :creator_is_musician before_create :generate_share_token @@ -44,11 +49,6 @@ module JamRuby SEPARATOR = '|' - NO_RECURRING = "once" - RECURRING_WEEKLY = "weekly" - - RECURRING_MODES = [NO_RECURRING, RECURRING_WEEKLY] - def add_to_feed feed = Feed.new feed.music_session = self diff --git a/ruby/spec/factories.rb b/ruby/spec/factories.rb index 20b37fb77..d8c5c4b5e 100644 --- a/ruby/spec/factories.rb +++ b/ruby/spec/factories.rb @@ -89,8 +89,13 @@ FactoryGirl.define do legal_terms true language 'english' legal_policy 'standard' + recurring_mode 'once' genre JamRuby::Genre.first association :creator, :factory => :user + + factory :recurring_music_session_weekly do + recurring_mode 'weekly' + end end factory :music_session_user_history, :class => JamRuby::MusicSessionUserHistory do