summaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-03-23 21:48:52 +0100
committerAzul <azul@riseup.net>2016-05-02 08:21:52 -0300
commit065859b90cc5ef403b8f47bd5394b343e556cc4d (patch)
treede62cd7a23b2db2a620911c6d861a7fda1d74a00 /engines
parentabf600089a4bc4b5c7271e17b1fd95a95deb293f (diff)
upgrade: remove references to RestClient
CouchRest > 1.2 does not use RestClient anymore. So we should not try to catch its errors.
Diffstat (limited to 'engines')
-rw-r--r--engines/support/app/models/ticket.rb2
-rw-r--r--engines/support/test/unit/ticket_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/support/app/models/ticket.rb b/engines/support/app/models/ticket.rb
index b1bdf8d..4615a10 100644
--- a/engines/support/app/models/ticket.rb
+++ b/engines/support/app/models/ticket.rb
@@ -50,7 +50,7 @@ class Ticket < CouchRest::Model::Base
self.by_created_by.key(user.id).each do |ticket|
ticket.destroy
end
- rescue RestClient::ResourceNotFound
+ rescue RESOURCE_NOT_FOUND
# silently ignore if design docs are not yet created
end
diff --git a/engines/support/test/unit/ticket_test.rb b/engines/support/test/unit/ticket_test.rb
index 7b5281f..c2c5e11 100644
--- a/engines/support/test/unit/ticket_test.rb
+++ b/engines/support/test/unit/ticket_test.rb
@@ -63,7 +63,7 @@ class TicketTest < ActiveSupport::TestCase
test "find tickets user commented on" do
# clear old tickets just in case
- # this will cause RestClient::ResourceNotFound errors if there are multiple copies of the same ticket returned
+ # this will cause RESOURCE_NOT_FOUND errors if there are multiple copies of the same ticket returned
Ticket.by_includes_post_by.key('123').each {|t| t.destroy}
# TODO: the by_includes_post_by view is only used for tests. Maybe we should get rid of it and change the test to including ordering?