VRFS-3007 : Fix tests and models failing due to PermissionError

This commit is contained in:
Steven Miers 2015-04-29 12:56:16 -05:00
parent 2260d21fc1
commit cf515a9cf0
4 changed files with 14 additions and 14 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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