From cf515a9cf0671afc189745cdef40697389a3129c Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Wed, 29 Apr 2015 12:56:16 -0500 Subject: [PATCH] VRFS-3007 : Fix tests and models failing due to PermissionError --- ruby/lib/jam_ruby/models/online_presence.rb | 4 ++-- ruby/lib/jam_ruby/models/performance_sample.rb | 4 ++-- ruby/spec/jam_ruby/models/online_presence_spec.rb | 12 ++++++------ ruby/spec/jam_ruby/models/performance_sample_spec.rb | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ruby/lib/jam_ruby/models/online_presence.rb b/ruby/lib/jam_ruby/models/online_presence.rb index 8061ac571..c01f545ec 100644 --- a/ruby/lib/jam_ruby/models/online_presence.rb +++ b/ruby/lib/jam_ruby/models/online_presence.rb @@ -51,7 +51,7 @@ module JamRuby online_presence = OnlinePresence.find(id) if online_presence.user_id != current_user.id - raise PermissionError, PERMISSION_MSG + raise JamPermissionError, PERMISSION_MSG end unless online_presence.nil? @@ -61,7 +61,7 @@ module JamRuby private def self.auth_user(current_user, options={}) - raise PermissionError, PERMISSION_MSG if current_user.nil? || options[:user_id] != current_user.id + raise JamPermissionError, PERMISSION_MSG if current_user.nil? || options[:user_id] != current_user.id end end end \ No newline at end of file diff --git a/ruby/lib/jam_ruby/models/performance_sample.rb b/ruby/lib/jam_ruby/models/performance_sample.rb index 703ebe2e0..e6aa21703 100644 --- a/ruby/lib/jam_ruby/models/performance_sample.rb +++ b/ruby/lib/jam_ruby/models/performance_sample.rb @@ -59,14 +59,14 @@ module JamRuby end def self.delete(current_user, options = {}) - raise PermissionError, "You do not have permission to perform this operation" if current_user.nil? || options[:user_id] != current_user.id + raise JamPermissionError, "You do not have permission to perform this operation" if current_user.nil? || options[:user_id] != current_user.id raise StateError, "The performance sample ID is missing." if options[:id].blank? PerformanceSample.destroy(options[:id]) end private def self.auth_user(current_user, options={}) - raise PermissionError, PERMISSION_MSG if current_user.nil? || options[:user_id] != current_user.id + raise JamPermissionError, PERMISSION_MSG if current_user.nil? || options[:user_id] != current_user.id end end end \ No newline at end of file diff --git a/ruby/spec/jam_ruby/models/online_presence_spec.rb b/ruby/spec/jam_ruby/models/online_presence_spec.rb index ce642ac58..18b37df65 100644 --- a/ruby/spec/jam_ruby/models/online_presence_spec.rb +++ b/ruby/spec/jam_ruby/models/online_presence_spec.rb @@ -59,8 +59,8 @@ describe OnlinePresence do end context "when request is not valid" do - it "should raise PermissionError if requester id does not match id in request" do - lambda{OnlinePresence.create(user1, {:user_id => user2.id, :service_type => "soundcloud", :username => "soundclouduser2"})}.should raise_error(PermissionError) + it "should raise JamPermissionError if requester id does not match id in request" do + lambda{OnlinePresence.create(user1, {:user_id => user2.id, :service_type => "soundcloud", :username => "soundclouduser2"})}.should raise_error(JamPermissionError) end it "should raise error if service type is missing" do @@ -107,8 +107,8 @@ describe OnlinePresence do end context "when request is not valid" do - it "should raise PermissionError if requester id does not match id in request" do - lambda{OnlinePresence.update(user1, {:user_id => user2.id, :id => @online_presence.id, :service_type => "soundcloud", :username => "soundclouduser2"})}.should raise_error(PermissionError) + it "should raise JamPermissionError if requester id does not match id in request" do + lambda{OnlinePresence.update(user1, {:user_id => user2.id, :id => @online_presence.id, :service_type => "soundcloud", :username => "soundclouduser2"})}.should raise_error(JamPermissionError) end it "should raise error if type is missing" do @@ -148,8 +148,8 @@ describe OnlinePresence do end context "when request is not valid" do - it "should raise PermissionError if requester id does not match id in request" do - lambda{OnlinePresence.delete(user2, {:user_id => user1.id, :id => @online_presence.id})}.should raise_error(PermissionError) + it "should raise JamPermissionError if requester id does not match id in request" do + lambda{OnlinePresence.delete(user2, {:user_id => user1.id, :id => @online_presence.id})}.should raise_error(JamPermissionError) end it "should raise error if user presence id is missing" do diff --git a/ruby/spec/jam_ruby/models/performance_sample_spec.rb b/ruby/spec/jam_ruby/models/performance_sample_spec.rb index 343afd4bd..8aa68ea85 100644 --- a/ruby/spec/jam_ruby/models/performance_sample_spec.rb +++ b/ruby/spec/jam_ruby/models/performance_sample_spec.rb @@ -58,8 +58,8 @@ describe PerformanceSample do end context "when request is not valid" do - it "should raise PermissionError if requester id does not match id in request" do - lambda{PerformanceSample.create(user1, {:user_id => user2.id, :service_type => "soundcloud", :service_id => "12345"})}.should raise_error(PermissionError) + it "should raise JamPermissionError if requester id does not match id in request" do + lambda{PerformanceSample.create(user1, {:user_id => user2.id, :service_type => "soundcloud", :service_id => "12345"})}.should raise_error(JamPermissionError) end it "should raise error if service type is missing" do @@ -110,8 +110,8 @@ describe PerformanceSample do end context "when request is not valid" do - it "should raise PermissionError if requester id does not match id in request" do - lambda{PerformanceSample.delete(user2, {:user_id => user1.id, :id => @user_sample.id})}.should raise_error(PermissionError) + it "should raise JamPermissionError if requester id does not match id in request" do + lambda{PerformanceSample.delete(user2, {:user_id => user1.id, :id => @user_sample.id})}.should raise_error(JamPermissionError) end it "should raise error if user sample id is missing" do