esp_sdk 2.0.0 → 2.1.0

data/test/esp/extensions/active_resource/formats/json_api_format_test.rb

@@ -7,7 +7,7 @@ module ActiveResource
         context '# decode' do
           context 'with ESP::Suppression' do
             should 'parse nested objects correctly' do
-              json = json(:dashboard)
+              json        = json(:dashboard)
               parsed_json = JSON.parse(json)
               stub_request(:get, %r{dashboard/recent.json*}).to_return(body: json_list(:dashboard, 1))
 
@@ -18,25 +18,28 @@ module ActiveResource
           end
 
           context 'with ESP::Alert' do
-            should 'merge included objects' do
-              json = json_list(:alert, 1)
+            should 'merge nested included objects' do
+              json        = json(:alert)
               parsed_json = JSON.parse(json)
-              stub_request(:get, %r{reports/1/alerts.json*}).to_return(body: json)
+              stub_request(:get, %r{alerts/1.json*}).to_return(body: json)
 
-              alert = ESP::Alert.for_report(1, include: 'external_accounts,regions,signatures,cloud_trail_events').first
+              alert = ESP::Alert.find(1, include: 'external_account.team.organization,region,signature,cloud_trail_events')
 
               assert_equal parsed_json['included'].detect { |e| e['type'] == 'external_accounts' }['id'], alert.external_account.id
+              assert_equal parsed_json['included'].detect { |e| e['type'] == 'organizations' }['id'], alert.external_account.organization.id
+              assert_equal parsed_json['included'].detect { |e| e['type'] == 'teams' }['id'], alert.external_account.team.id
+              assert_equal parsed_json['included'].detect { |e| e['type'] == 'organizations' }['id'], alert.external_account.team.organization.id
               assert_equal parsed_json['included'].detect { |e| e['type'] == 'regions' }['id'], alert.region.id
               assert_equal parsed_json['included'].detect { |e| e['type'] == 'signatures' }['id'], alert.signature.id
               assert_equal parsed_json['included'].detect { |e| e['type'] == 'cloud_trail_events' }['id'], alert.cloud_trail_events.first.id
             end
 
             should 'assign foreign keys' do
-              json = json_list(:alert, 1)
+              json        = json_list(:alert, 1)
               parsed_json = JSON.parse(json)
-              stub_request(:get, %r{reports/1/alerts.json*}).to_return(body: json)
+              stub_request(:put, %r{reports/1/alerts.json*}).to_return(body: json)
 
-              alert = ESP::Alert.for_report(1).first
+              alert = ESP::Alert.where(report_id: 1).first
 
               assert_equal parsed_json['included'].detect { |e| e['type'] == 'external_accounts' }['id'], alert.external_account_id
               assert_equal parsed_json['included'].detect { |e| e['type'] == 'regions' }['id'], alert.region_id
@@ -60,14 +63,25 @@ module ActiveResource
           end
 
           should 'merge included objects' do
-            alert = ESP::Alert.find(1, include: 'external_account,region,signature')
+            alert = ESP::Alert.find(1, include: 'external_account.team.organization,region,signature,custom_signature')
 
             assert_not_nil alert.attributes['external_account']
             assert_equal alert.external_account_id, alert.external_account.id
+            assert_not_nil alert.external_account.attributes['organization']
+            assert_equal alert.external_account.organization_id, alert.external_account.organization.id
+            assert_not_nil alert.external_account.attributes['team']
+            assert_equal alert.external_account.team_id, alert.external_account.team.id
+            assert_not_nil alert.external_account.team.attributes['organization']
+            assert_equal alert.external_account.team.organization_id, alert.external_account.team.organization.id
             assert_not_nil alert.attributes['region']
             assert_equal alert.region_id, alert.region.id
-            assert_not_nil alert.attributes['signature']
-            assert_equal alert.signature_id, alert.signature.id
+            if alert.signature.present?
+              assert_not_nil alert.attributes['signature']
+              assert_equal alert.signature_id, alert.signature.id
+            else
+              assert_not_nil alert.attributes['custom_signature']
+              assert_equal alert.custom_signature_id, alert.custom_signature.id
+            end
           end
 
           should 'assign foreign key for a belongs_to relationship' do
@@ -89,7 +103,7 @@ module ActiveResource
           context '.initialize' do
             should 'parse the response and return a descriptive error message' do
               error_response = json(:error, :active_record)
-              response = Net::HTTPBadRequest.new('1.0', '200', '')
+              response       = Net::HTTPBadRequest.new('1.0', '200', '')
               response.expects(:body).returns(error_response).at_least_once
 
               error = ActiveResource::BadRequest.new(response)

data/test/esp/extensions/active_resource/paginated_collection_test.rb

@@ -7,7 +7,7 @@ module ActiveResource
         context '#parse_pagination_links' do
           should 'not set the previous page or next page or last page when there is only 1 page' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 2, page: { number: 1, size: 20 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 2, page: { number: 1, size: 20 }))
 
             alerts = report.alerts
 
@@ -22,7 +22,7 @@ module ActiveResource
 
           should 'not set the previous page when on the first page' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 2, page: { number: 1, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 2, page: { number: 1, size: 1 }))
 
             alerts = report.alerts
 
@@ -37,7 +37,7 @@ module ActiveResource
 
           should 'not set the next or last page page when on the last page' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 2, page: { number: 2, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 2, page: { number: 2, size: 1 }))
 
             alerts = report.alerts
 
@@ -52,7 +52,7 @@ module ActiveResource
 
           should 'set the next, last and previous page page when not on the first or last page' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 }))
 
             alerts = report.alerts
 
@@ -67,7 +67,7 @@ module ActiveResource
 
           should 'set page size on each link' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 }))
 
             alerts = report.alerts
 
@@ -80,7 +80,7 @@ module ActiveResource
             # The last page may not contain the full per page number of records, and will therefore come back with an incorrect size since the
             # size is based on the collection size.  This will mess up further calls to previous_page or first page so remove the size so it will bring back the default size.
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 2 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 2 }))
 
             alerts = report.alerts
 
@@ -89,31 +89,33 @@ module ActiveResource
         end
 
         context '#first_page' do
-          should 'call the api with the original url and the page number 1 param' do
+          should 'call the api with the original url and params and the page number 1 param' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 1, size: 1 }))
-            alerts = report.alerts
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 1, size: 1 }))
+            alerts = report.alerts(status: 'pass')
 
             page = alerts.first_page
 
             assert_equal '1', page.current_page_number
             assert_equal '2', alerts.current_page_number # original object is unchanged
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
-              if req.uri.query.present? # The first call will not have query params, only the second call
-                assert_equal "page[number]=1", URI.unescape(req.uri.query)
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
+              body = JSON.parse(req.body)
+              if body["page"].present? # The first call will not have a body["page"], only the second call
+                assert_equal 1, body["page"]["number"]
+                assert_equal 'pass', body["filter"]["status"]
               end
             end
           end
 
           should 'not call the api and return self if already on the first page' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 1, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 1, size: 1 }))
             alerts = report.alerts
 
             page = alerts.first_page
 
             assert_equal '1', page.current_page_number
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
               assert_predicate req.uri.query, :blank? # It will only be called once to get the first page
             end
           end
@@ -122,46 +124,48 @@ module ActiveResource
         context '#first_page!' do
           should 'call the api with the original url and the page number 1 param and update itself' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 1, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 1, size: 1 }))
             alerts = report.alerts
 
             alerts.first_page!
 
             assert_equal '1', alerts.current_page_number
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
-              if req.uri.query.present? # The first call will not have query params, only the second call
-                assert_equal "page[number]=1", URI.unescape(req.uri.query)
-              end
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
+              body = JSON.parse(req.body)
+              assert_equal 1, body["page"]["number"] if body.present? # The first call will not have a body, only the second call
             end
           end
         end
 
         context '#previous_page' do
-          should 'call the api with the original url and the previous page number param' do
+          should 'call the api with the original url and original params and the previous page number param' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 1, size: 1 }))
-            alerts = report.alerts
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 1, size: 1 }))
+            alerts = report.alerts(status: 'pass')
 
             page = alerts.previous_page
 
             assert_equal '1', page.current_page_number
             assert_equal '2', alerts.current_page_number # original object is unchanged
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
-              if req.uri.query.present? # The first call will not have query params, only the second call
-                assert_equal "page[number]=1&page[size]=1", URI.unescape(req.uri.query)
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
+              body = JSON.parse(req.body)
+              if body["page"].present? # The first call will not have a body["page"], only the second call
+                assert_equal '1', body["page"]["number"]
+                assert_equal '1', body["page"]["size"]
+                assert_equal 'pass', body["filter"]["status"]
               end
             end
           end
 
           should 'not call the api and return self if already on the first page' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 1, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 1, size: 1 }))
             alerts = report.alerts
 
             page = alerts.previous_page
 
             assert_equal '1', page.current_page_number
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
               assert_predicate req.uri.query, :blank? # It will only be called once to get the first page
             end
           end
@@ -170,46 +174,51 @@ module ActiveResource
         context '#previous_page!' do
           should 'call the api with the original url and the previous page number param and update itself' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 1, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 1, size: 1 }))
             alerts = report.alerts
 
             alerts.previous_page!
 
             assert_equal '1', alerts.current_page_number
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
-              if req.uri.query.present? # The first call will not have query params, only the second call
-                assert_equal "page[number]=1&page[size]=1", URI.unescape(req.uri.query)
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
+              body = JSON.parse(req.body)
+              if body.present? # The first call will not have a body, only the second call
+                assert_equal '1', body["page"]["number"]
+                assert_equal '1', body["page"]["size"]
               end
             end
           end
         end
 
         context '#next_page' do
-          should 'call the api with the original url and the next page number param' do
+          should 'call the api with the original url and original params and the next page number param' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
-            alerts = report.alerts
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
+            alerts = report.alerts(status: 'pass')
 
             page = alerts.next_page
 
             assert_equal '3', page.current_page_number
             assert_equal '2', alerts.current_page_number # original object is unchanged
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
-              if req.uri.query.present? # The first call will not have query params, only the second call
-                assert_equal "page[number]=3&page[size]=1", URI.unescape(req.uri.query)
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
+              body = JSON.parse(req.body)
+              if body["page"].present? # The first call will not have a body["page"], only the second call
+                assert_equal '3', body["page"]["number"]
+                assert_equal '1', body["page"]["size"]
+                assert_equal 'pass', body["filter"]["status"]
               end
             end
           end
 
           should 'not call the api and return self if already on the last page' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
             alerts = report.alerts
 
             page = alerts.next_page
 
             assert_equal '3', page.current_page_number
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
               assert_predicate req.uri.query, :blank? # It will only be called once to get the first page
             end
           end
@@ -218,46 +227,51 @@ module ActiveResource
         context '#next_page!' do
           should 'call the api with the original url and the next page number param and update itself' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
             alerts = report.alerts
 
             alerts.next_page!
 
             assert_equal '3', alerts.current_page_number
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
-              if req.uri.query.present? # The first call will not have query params, only the second call
-                assert_equal "page[number]=3&page[size]=1", URI.unescape(req.uri.query)
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
+              body = JSON.parse(req.body)
+              if body.present? # The first call will not have a body, only the second call
+                assert_equal '3', body["page"]["number"]
+                assert_equal '1', body["page"]["size"]
               end
             end
           end
         end
 
         context '#last_page' do
-          should 'call the api with the original url and the last page number param' do
+          should 'call the api with the original url and original params and the last page number param' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
-            alerts = report.alerts
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
+            alerts = report.alerts(status: 'pass')
 
             page = alerts.last_page
 
             assert_equal '3', page.current_page_number
             assert_equal '2', alerts.current_page_number # original object is unchanged
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
-              if req.uri.query.present? # The first call will not have query params, only the second call
-                assert_equal "page[number]=3&page[size]=1", URI.unescape(req.uri.query)
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
+              body = JSON.parse(req.body)
+              if body["page"].present? # The first call will not have a body["page"], only the second call
+                assert_equal '3', body["page"]["number"]
+                assert_equal '1', body["page"]["size"]
+                assert_equal 'pass', body["filter"]["status"]
               end
             end
           end
 
           should 'not call the api and return self if already on the last page' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
             alerts = report.alerts
 
             page = alerts.last_page
 
             assert_equal '3', page.current_page_number
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
               assert_predicate req.uri.query, :blank? # It will only be called once to get the first page
             end
           end
@@ -266,15 +280,17 @@ module ActiveResource
         context '#last_page!' do
           should 'call the api with the original url and the last page number param and update itself' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
             alerts = report.alerts
 
             alerts.last_page!
 
             assert_equal '3', alerts.current_page_number
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
-              if req.uri.query.present? # The first call will not have query params, only the second call
-                assert_equal "page[number]=3&page[size]=1", URI.unescape(req.uri.query)
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
+              body = JSON.parse(req.body)
+              if body.present? # The first call will not have a body, only the second call
+                assert_equal '3', body["page"]["number"]
+                assert_equal '1', body["page"]["size"]
               end
             end
           end
@@ -283,7 +299,7 @@ module ActiveResource
         context '#page' do
           should 'raise an error if the page number is not given' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
             alerts = report.alerts
 
             error = assert_raises ArgumentError do
@@ -294,7 +310,7 @@ module ActiveResource
 
           should 'raise an error if the page number is not a positive number' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
             alerts = report.alerts
 
             error = assert_raises ArgumentError do
@@ -305,7 +321,7 @@ module ActiveResource
 
           should 'raise an error if the page number is greater than the last page number' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
             alerts = report.alerts
 
             error = assert_raises ArgumentError do
@@ -314,31 +330,34 @@ module ActiveResource
             assert_equal "Page number cannot be greater than the last page number.", error.message
           end
 
-          should 'call the api with the original url and the page number param' do
+          should 'call the api with the original url and original params and the page number param' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
-            alerts = report.alerts
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
+            alerts = report.alerts(status: 'pass')
 
             page = alerts.page(3)
 
             assert_equal '3', page.current_page_number
             assert_equal '2', alerts.current_page_number # original object is unchanged
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
-              if req.uri.query.present? # The first call will not have query params, only the second call
-                assert_equal "page[number]=3&page[size]=1", URI.unescape(req.uri.query)
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
+              body = JSON.parse(req.body)
+              if body["page"].present? # The first call will not have a body["page"], only the second call
+                assert_equal 3, body["page"]["number"]
+                assert_equal '1', body["page"]["size"]
+                assert_equal 'pass', body["filter"]["status"]
               end
             end
           end
 
           should 'not call the api and return self if already on that page' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 }))
             alerts = report.alerts
 
             page = alerts.page(2)
 
             assert_equal '2', page.current_page_number
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
               assert_predicate req.uri.query, :blank? # It will only be called once to get the first page
             end
           end
@@ -347,15 +366,17 @@ module ActiveResource
         context '#page!' do
           should 'call the api with the original url and the page number 1 param and update itself' do
             report = build(:report)
-            stub_request(:get, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
+            stub_request(:put, %r{reports/#{report.id}/alerts.json*}).to_return(body: json_list(:alert, 3, page: { number: 2, size: 1 })).then.to_return(body: json_list(:alert, 3, page: { number: 3, size: 1 }))
             alerts = report.alerts
 
             alerts.page!(3)
 
             assert_equal '3', alerts.current_page_number
-            assert_requested(:get, %r{reports/#{report.id}/alerts.json*}) do |req|
-              if req.uri.query.present? # The first call will not have query params, only the second call
-                assert_equal "page[number]=3&page[size]=1", URI.unescape(req.uri.query)
+            assert_requested(:put, %r{reports/#{report.id}/alerts.json*}) do |req|
+              body = JSON.parse(req.body)
+              if body.present? # The first call will not have a body, only the second call
+                assert_equal '3', body["page"]["number"].to_s
+                assert_equal '1', body["page"]["size"].to_s
               end
             end
           end
@@ -373,7 +394,7 @@ module ActiveResource
         end
 
         should 'always return the correct page and update itself when using the ! methods' do
-          report = ESP::Report.last
+          report = ESP::Report.all.detect { |r| r.status == 'complete' }
           alerts = report.alerts
           last_page_number = alerts.last_page_number
 
@@ -402,7 +423,7 @@ module ActiveResource
         end
 
         should 'always return the correct page and when not using the ! methods' do
-          report = ESP::Report.last
+          report = ESP::Report.all.detect { |r| r.status == 'complete' }
           alerts = report.alerts
           last_page_number = alerts.last_page_number
 

data/test/esp/extensions/active_resource/validations_test.rb

@@ -6,12 +6,7 @@ module ActiveResource
       context "with ESP::Team" do
         context '#load_remote_errors' do
           should 'should parse an active record response and put error messages in the errors object' do
-            error = ActiveResource::ResourceInvalid.new('') # ResourceInvalid gets caught by the create method.
-            error_response = json(:error, :active_record)
-            response = mock(body: error_response)
-            error.expects(:response).returns(response)
-            ActiveResource::Connection.any_instance.expects(:post).raises(error)
-            stub_request(:post, /teams.json*/).to_return(body: json_list(:alert, 2))
+            stub_request(:post, /teams.json*/).to_return(status: 422, body: json(:error, :active_record))
 
             team = ESP::Team.create
 
@@ -21,12 +16,7 @@ module ActiveResource
           end
 
           should 'should parse a non active record response and put error messages in the errors object' do
-            error = ActiveResource::ResourceInvalid.new('') # ResourceInvalid gets caught by the create method.
-            error_response = json(:error)
-            response = mock(body: error_response)
-            error.expects(:response).returns(response)
-            ActiveResource::Connection.any_instance.expects(:post).raises(error)
-            stub_request(:post, /teams.json*/).to_return(body: json_list(:alert, 2))
+            stub_request(:post, /teams.json*/).to_return(status: 422, body: json(:error))
 
             team = ESP::Team.create