esp_sdk 2.7.0 → 2.8.0

data/test/esp/integration/custom_signature_result_integration_test.rb

@@ -64,7 +64,8 @@ module ESP::Integration
 
         context '#create' do
           should 'be able to create' do
-            custom_signature = ESP::CustomSignature.create(name: 'ABC', identifier: 'ABC', risk_level: 'High')
+            team = ESP::Team.last
+            custom_signature = ESP::CustomSignature.create(name: 'ABC', identifier: 'ABC', risk_level: 'High', team_ids: [team.id])
             refute_predicate custom_signature, :new?
             definition = custom_signature.definitions.first
             fail 'Missing definition' if definition.blank?

data/test/esp/integration/json_api_format_integration_test.rb

@@ -6,7 +6,7 @@ module ESP::Integration
       context ActiveResource::Formats::JsonAPIFormat do
         context 'live calls' do
           should 'merge included objects' do
-            report = ESP::Report.first
+            report = ESP::Report.first(params: { sorts: 'id' })
             alert = ESP::Alert.where(report_id: report.id, include: 'external_account.team.organization,region,signature,custom_signature').first
 
             assert_not_nil alert.attributes['external_account']

data/test/esp/integration/suppression_integration_test.rb

@@ -5,7 +5,7 @@ module ESP::Integration
     context ESP::Suppression do
       context 'live calls' do
         setup do
-          @s = ESP::Suppression.first
+          @s = ESP::Suppression.first(params: { sorts: 'id' })
           fail "Live DB does not have any suppressions.  Add a suppression and run tests again." if @s.blank?
         end
 

data/test/esp/integration/suppression_unique_identifier_integration_test.rb

@@ -9,7 +9,7 @@ module ESP::Integration
             should 'return error when reason is not supplied' do
               alert_id = ESP::Report.all.detect { |r| r.status == 'complete' }.alerts.last.id
 
-              suppression = ESP::Suppression::UniqueIdentifier.create(alert_id: alert_id)
+              suppression = ESP::Suppression::UniqueIdentifier.create(alert_id: alert_id, reason: '')
 
               assert_equal "Suppression reason can't be blank", suppression.errors.full_messages.first
             end

data/test/esp/resources/custom_signature/definition_test.rb

@@ -23,7 +23,7 @@ module ESP
             definition.results
 
             assert_requested(:get, /custom_signature_results.json*/) do |req|
-              assert_equal "filter[definition_id_eq]=#{definition.id}", URI.unescape(req.uri.query)
+              assert_equal "filter[definition_id_eq]=#{definition.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
             end
           end
         end

data/test/esp/resources/custom_signature_test.rb

@@ -36,7 +36,7 @@ module ESP
           custom_signature.definitions
 
           assert_requested(:get, /custom_signature_definitions.json*/) do |req|
-            assert_equal "filter[custom_signature_id_eq]=#{custom_signature.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[custom_signature_id_eq]=#{custom_signature.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end

data/test/esp/resources/external_account_test.rb

@@ -44,7 +44,7 @@ module ESP
           external_account.reports
 
           assert_requested(:get, /reports.json*/) do |req|
-            assert_equal "filter[external_account_id_eq]=#{external_account.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[external_account_id_eq]=#{external_account.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end

data/test/esp/resources/organization_test.rb

@@ -29,7 +29,7 @@ module ESP
           organization.teams
 
           assert_requested(:get, /teams.json*/) do |req|
-            assert_equal "filter[organization_id_eq]=#{organization.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[organization_id_eq]=#{organization.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end
@@ -42,7 +42,7 @@ module ESP
           organization.sub_organizations
 
           assert_requested(:get, /sub_organizations.json*/) do |req|
-            assert_equal "filter[organization_id_eq]=#{organization.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[organization_id_eq]=#{organization.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end
@@ -55,7 +55,7 @@ module ESP
           organization.users
 
           assert_requested(:get, /users.json*/) do |req|
-            assert_equal "filter[organization_id_eq]=#{organization.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[organization_id_eq]=#{organization.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end
@@ -68,7 +68,7 @@ module ESP
           organization.reports
 
           assert_requested(:get, /reports.json*/) do |req|
-            assert_equal "filter[organization_id_eq]=#{organization.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[organization_id_eq]=#{organization.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end
@@ -81,7 +81,7 @@ module ESP
           organization.external_accounts
 
           assert_requested(:get, /external_accounts.json*/) do |req|
-            assert_equal "filter[organization_id_eq]=#{organization.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[organization_id_eq]=#{organization.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end
@@ -94,7 +94,7 @@ module ESP
           organization.custom_signatures
 
           assert_requested(:get, /custom_signatures.json*/) do |req|
-            assert_equal "filter[organization_id_eq]=#{organization.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[organization_id_eq]=#{organization.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end

data/test/esp/resources/service_test.rb

@@ -19,7 +19,7 @@ module ESP
           s.signatures
 
           assert_requested(:get, /signatures.json*/) do |req|
-            assert_equal "filter[service_id_eq]=#{s.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[service_id_eq]=#{s.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end

data/test/esp/resources/sub_organization_test.rb

@@ -22,7 +22,7 @@ module ESP
           sub_organization.teams
 
           assert_requested(:get, /teams.json*/) do |req|
-            assert_equal "filter[sub_organization_id_eq]=#{sub_organization.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[sub_organization_id_eq]=#{sub_organization.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end
@@ -35,7 +35,7 @@ module ESP
           sub_organization.external_accounts
 
           assert_requested(:get, /external_accounts.json*/) do |req|
-            assert_equal "filter[sub_organization_id_eq]=#{sub_organization.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[sub_organization_id_eq]=#{sub_organization.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end
@@ -48,7 +48,7 @@ module ESP
           sub_organization.reports
 
           assert_requested(:get, /reports.json*/) do |req|
-            assert_equal "filter[sub_organization_id_eq]=#{sub_organization.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[sub_organization_id_eq]=#{sub_organization.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end

data/test/esp/resources/team_test.rb

@@ -33,7 +33,7 @@ module ESP
           team.external_accounts
 
           assert_requested(:get, /external_accounts.json*/) do |req|
-            assert_equal "filter[team_id_eq]=#{team.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[team_id_eq]=#{team.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end
@@ -60,7 +60,7 @@ module ESP
           team.reports
 
           assert_requested(:get, /reports.json*/) do |req|
-            assert_equal "filter[team_id_eq]=#{team.id}", URI.unescape(req.uri.query)
+            assert_equal "filter[team_id_eq]=#{team.id}", URI::DEFAULT_PARSER.unescape(req.uri.query)
           end
         end
       end

data/test/factories/contact_requests.rb

@@ -14,8 +14,7 @@ FactoryGirl.define do
         links: {
           related: "http://test.host/api/v2/users/1001.json"
         }
-      }
-      }
+      } }
     end
   end
 end

data/test/factories/custom_signature/definitions.rb

@@ -23,8 +23,7 @@ FactoryGirl.define do
           links: {
             related: "http://localhost:3000/api/v2/custom_signature_results.json?filter%5Bdefinition_id_eq%5D=#{id}"
           }
-        }
-      }
+        } }
     end
   end
 end

data/test/factories/dashboards.rb

@@ -17,8 +17,7 @@ FactoryGirl.define do
         links: {
           related: "http://test.host/api/v2/reports/1/stats.json"
         }
-      }
-      }
+      } }
     end
     included do
       [

data/test/factories/external_accounts.rb

@@ -37,8 +37,7 @@ FactoryGirl.define do
           links: {
             related: "http://localhost:3000/api/v2/teams/1.json"
           }
-        }
-      }
+        } }
     end
   end
 end

data/test/factories/organizations.rb

@@ -41,8 +41,7 @@ FactoryGirl.define do
           links: {
             related: "http://localhost:3000/api/v2/teams.json?filter%5Borganization_id_eq%5D=2"
           }
-        }
-      }
+        } }
     end
   end
 end

data/test/factories/reports.rb

@@ -48,8 +48,7 @@ FactoryGirl.define do
           links: {
             related: "http://localhost:3000/api/v2/reports/55/alerts.json"
           }
-        }
-      }
+        } }
     end
   end
 end

data/test/factories/scan_intervals.rb

@@ -25,8 +25,7 @@ FactoryGirl.define do
           links: {
             related: "http://localhost:3000/api/v2/services/1.json"
           }
-        }
-      }
+        } }
     end
   end
 end

data/test/factories/stat_custom_signatures.rb

@@ -90,8 +90,7 @@ FactoryGirl.define do
         links: {
           related: "http://test.host/api/v2/custom_signatures/1.json"
         }
-      }
-      }
+      } }
     end
   end
 end

data/test/factories/stat_regions.rb

@@ -90,8 +90,7 @@ FactoryGirl.define do
         links: {
           related: "http://test.host/api/v2/regions/3.json"
         }
-      }
-      }
+      } }
     end
   end
 end

data/test/factories/stat_services.rb

@@ -90,8 +90,7 @@ FactoryGirl.define do
         links: {
           related: "http://test.host/api/v2/services/1.json"
         }
-      }
-      }
+      } }
     end
   end
 end

data/test/factories/stat_signautures.rb

@@ -90,8 +90,7 @@ FactoryGirl.define do
         links: {
           related: "http://test.host/api/v2/signatures/1.json"
         }
-      }
-      }
+      } }
     end
   end
 end

data/test/factories/stats.rb

@@ -122,8 +122,7 @@ FactoryGirl.define do
               type: "stat_custom_signatures"
             }
           ]
-        }
-      }
+        } }
     end
   end
 end

data/test/factories/sub_organizations.rb

@@ -27,8 +27,7 @@ FactoryGirl.define do
           links: {
             related: "http://localhost:3000/api/v2/teams.json?filter%5Bsub_organization_id_eq%5D=34"
           }
-        }
-      }
+        } }
     end
   end
 end

data/test/factories/suppression/regions.rb

@@ -62,8 +62,7 @@ FactoryGirl.define do
               }
             }
           }
-        ]
-      }
+        ] }
     end
     relationships do
       { organization: {
@@ -83,8 +82,7 @@ FactoryGirl.define do
           links: {
             related: "http://localhost:3000/api/v2/users/1.json"
           }
-        }
-      }
+        } }
     end
   end
 end

data/test/factories/suppression/signatures.rb

@@ -89,8 +89,7 @@ FactoryGirl.define do
               }
             }
           }
-        ]
-      }
+        ] }
     end
     relationships do
       { organization: {
@@ -110,8 +109,7 @@ FactoryGirl.define do
           links: {
             related: "http://localhost:3000/api/v2/users/1.json"
           }
-        }
-      }
+        } }
     end
   end
 end

data/test/factories/suppression/unique_identifiers.rb

@@ -83,8 +83,7 @@ FactoryGirl.define do
               }
             }
           }
-        }
-      }
+        } }
     end
     relationships do
       { organization: {
@@ -104,8 +103,7 @@ FactoryGirl.define do
           links: {
             related: "http://localhost:3000/api/v2/users/1.json"
           }
-        }
-      }
+        } }
     end
   end
 end

data/test/factories/suppressions.rb

@@ -72,8 +72,7 @@ FactoryGirl.define do
           links: {
             related: "http://test.host/api/v2/custom_signatures.json?filter%5Bid_in%5D%5B%5D=6"
           }
-        }
-      }
+        } }
     end
 
     trait :with_include do

data/test/factories/users.rb

@@ -47,8 +47,7 @@ FactoryGirl.define do
           links: {
             related: "http://localhost:3000/api/v2/teams.json?filter%5Bq%5D%5Bid_in%5D%5B%5D=1"
           }
-        }
-      }
+        } }
     end
 
     trait :with_include do

data/test/test_helper.rb

@@ -1,12 +1,8 @@
 ENV['ESP_ENV'] = 'test'
-# Don't run coveralls when esp web runs sdk tests.
-if ENV['CI_BUILD_STAGE'].to_s.casecmp('test_sdk') != 0
-  require 'coveralls'
-  Coveralls.wear!
-end
+$VERBOSE = nil # hide those annoying instance variable not defined errors that come from gems
 
 require 'minitest/autorun'
-require 'minitest/reporters'
+require 'minitest/pride'
 require 'factory_girl'
 require 'mocha/mini_test'
 require 'bourne'
@@ -16,12 +12,10 @@ require 'rubygems'
 require 'active_resource'
 require_relative 'json_strategy'
 require_relative '../lib/esp_sdk'
-require_relative 'parallel_reporter'
 
 FactoryGirl.definition_file_paths = [File.expand_path('factories', File.dirname(__FILE__))]
 FactoryGirl.find_definitions
 FactoryGirl.register_strategy(:json, JsonStrategy)
-Minitest::Reporters.use! Minitest::Reporters::ParallelReporter.new(color: true)
 
 class ActiveSupport::TestCase
   include FactoryGirl::Syntax::Methods # so we can use json(:object) instead of FactoryGirl.json(:object)
@@ -41,8 +35,7 @@ class ActiveSupport::TestCase
     data             = json_array.map { |j| JSON.parse(j)['data'] }
     links            = build_links(data, page_args)
     list             = { 'data'  => data.slice(0, page_args[:size]),
-                         "links" => links
-    }
+                         "links" => links }
     list['included'] = JSON.parse(json_array.first)['included'] if json_array.first.present?
     list.to_json
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esp_sdk
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Evident.io
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,20 +108,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -193,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -207,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -221,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -235,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -249,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -282,14 +268,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -377,7 +363,6 @@ files:
 - lib/esp/version.rb
 - lib/esp_sdk.rb
 - lib/tasks/rubocop.rake
-- lib/tasks/testing.rake
 - test/esp/aws_clients_test.rb
 - test/esp/extensions/active_resource/dirty_test.rb
 - test/esp/extensions/active_resource/formats/json_api_format_test.rb
@@ -484,7 +469,6 @@ files:
 - test/factories/teams.rb
 - test/factories/users.rb
 - test/json_strategy.rb
-- test/parallel_reporter.rb
 - test/test_helper.rb
 homepage: https://github.com/EvidentSecurity/esp_sdk
 licenses:
@@ -506,7 +490,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: SDK for interacting with the ESP API.
@@ -617,5 +601,4 @@ test_files:
 - test/factories/teams.rb
 - test/factories/users.rb
 - test/json_strategy.rb
-- test/parallel_reporter.rb
 - test/test_helper.rb