From 39415cdf22f68542487ecd801454acd895f21a4d Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 17 Feb 2015 10:41:49 -0600 Subject: [PATCH] * remove BPM from jam_tracks --- admin/spec/factories.rb | 1 - db/manifest | 3 ++- db/up/remove_bpm_from_jamtracks.sql | 1 + ruby/lib/jam_ruby/models/jam_track.rb | 1 - ruby/spec/factories.rb | 1 - ruby/spec/jam_ruby/models/jam_track_spec.rb | 19 ------------------- web/spec/factories.rb | 1 - 7 files changed, 3 insertions(+), 24 deletions(-) create mode 100644 db/up/remove_bpm_from_jamtracks.sql diff --git a/admin/spec/factories.rb b/admin/spec/factories.rb index 08f668ff3..156fb1a6f 100644 --- a/admin/spec/factories.rb +++ b/admin/spec/factories.rb @@ -223,7 +223,6 @@ FactoryGirl.define do factory :jam_track, :class => JamRuby::JamTrack do sequence(:name) { |n| "jam-track-#{n}" } sequence(:description) { |n| "description-#{n}" } - bpm 100.1 time_signature '4/4' status 'Production' recording_type 'Cover' diff --git a/db/manifest b/db/manifest index 212832f28..55f1373b5 100755 --- a/db/manifest +++ b/db/manifest @@ -251,4 +251,5 @@ backing_tracks.sql metronome.sql recorded_backing_tracks.sql recorded_backing_tracks_add_filename.sql -user_syncs_include_backing_tracks.sql \ No newline at end of file +user_syncs_include_backing_tracks.sql +remove_bpm_from_jamtracks.sql \ No newline at end of file diff --git a/db/up/remove_bpm_from_jamtracks.sql b/db/up/remove_bpm_from_jamtracks.sql new file mode 100644 index 000000000..681c3b8b8 --- /dev/null +++ b/db/up/remove_bpm_from_jamtracks.sql @@ -0,0 +1 @@ +ALTER TABLE jam_tracks DROP COLUMN bpm; \ No newline at end of file diff --git a/ruby/lib/jam_ruby/models/jam_track.rb b/ruby/lib/jam_ruby/models/jam_track.rb index 7f383f5dc..3d884ca3a 100644 --- a/ruby/lib/jam_ruby/models/jam_track.rb +++ b/ruby/lib/jam_ruby/models/jam_track.rb @@ -20,7 +20,6 @@ module JamRuby validates :name, presence: true, uniqueness: true, length: {maximum: 200} validates :description, length: {maximum: 1000} - validates_format_of :bpm, with: /^\d+\.*\d{0,1}$/ validates :time_signature, inclusion: {in: [nil] + TIME_SIGNATURES} validates :status, inclusion: {in: [nil] + STATUS} validates :recording_type, inclusion: {in: [nil] + RECORDING_TYPE} diff --git a/ruby/spec/factories.rb b/ruby/spec/factories.rb index 8d897d4ac..42418a699 100644 --- a/ruby/spec/factories.rb +++ b/ruby/spec/factories.rb @@ -719,7 +719,6 @@ FactoryGirl.define do factory :jam_track, :class => JamRuby::JamTrack do sequence(:name) { |n| "jam-track-#{n}" } sequence(:description) { |n| "description-#{n}" } - bpm 100.1 time_signature '4/4' status 'Production' recording_type 'Cover' diff --git a/ruby/spec/jam_ruby/models/jam_track_spec.rb b/ruby/spec/jam_ruby/models/jam_track_spec.rb index 0c3ab5936..af4980f7b 100644 --- a/ruby/spec/jam_ruby/models/jam_track_spec.rb +++ b/ruby/spec/jam_ruby/models/jam_track_spec.rb @@ -55,25 +55,6 @@ describe JamTrack do end describe "validations" do - describe "bpm" do - it "1" do - FactoryGirl.build(:jam_track, bpm: 1).valid?.should be_true - end - - it "100" do - FactoryGirl.build(:jam_track, bpm: 100).valid?.should be_true - end - - it "100.1" do - FactoryGirl.build(:jam_track, bpm: 100.1).valid?.should be_true - end - - it "100.12" do - jam_track = FactoryGirl.build(:jam_track, bpm: 100.12) - jam_track.valid?.should be_false - jam_track.errors[:bpm].should == ['is invalid'] - end - end describe "price" do diff --git a/web/spec/factories.rb b/web/spec/factories.rb index eeb17a8c0..3dfecec19 100644 --- a/web/spec/factories.rb +++ b/web/spec/factories.rb @@ -711,7 +711,6 @@ FactoryGirl.define do factory :jam_track, :class => JamRuby::JamTrack do sequence(:name) { |n| "jam-track-#{n}" } sequence(:description) { |n| "description-#{n}" } - bpm 100.1 time_signature '4/4' status 'Production' recording_type 'Cover'