my_john_deere_api 0.12.4 → 0.12.6

data/test/lib/my_john_deere_api/model/contribution_product_test.rb

@@ -0,0 +1,68 @@
+require 'support/helper'
+
+describe 'MyJohnDeereApi::Model::ContributionProduct' do
+  let(:record) do
+    {
+      "@type" => "ContributionProduct",
+      "marketPlaceName" => "SpiffyApp",
+      "marketPlaceDescription" => "SpiffyApp",
+      "marketPlaceLogo" => "https://example.com/logo.png",
+      "defaultLocale" => "en-us",
+      "currentStatus" => "APPROVED",
+      "activationCallback" => "https://example.com/activation_callback",
+      "previewImages" => ["https://example.com/preview.png"],
+      "supportedRegions" => ["US"],
+      "supportedOperationCenters" => ["something"],
+      "id" => "#{contribution_product_id}",
+      "links" => [
+        {
+          "@type" => "Link",
+          "rel" => "self",
+          "uri" => "https://sandboxapi.deere.com/platform/contributionProducts/#{contribution_product_id}"
+        },
+        {
+          "@type" => "Link",
+          "rel" => "contributionDefinition",
+          "uri" => "https://sandboxapi.deere.com/platform/contributionProducts/#{contribution_product_id}/contributionDefinitions"
+        }
+      ]
+    }
+  end
+
+  describe '#initialize' do
+    def link_for label
+      camel_label = label.gsub(/_(.)/){|m| m[1].upcase}
+      record['links'].detect{|link| link['rel'] == camel_label}['uri'].gsub('https://sandboxapi.deere.com/platform', '')
+    end
+
+    it 'sets the attributes from the given record' do
+      product = JD::Model::ContributionProduct.new(record)
+
+      # basic attributes
+      assert_equal record['id'], product.id
+      assert_equal record['marketPlaceName'], product.market_place_name
+      assert_equal record['marketPlaceDescription'], product.market_place_description
+      assert_equal record['defaultLocale'], product.default_locale
+      assert_equal record['currentStatus'], product.current_status
+      assert_equal record['activationCallback'], product.activation_callback
+      assert_equal record['previewImages'], product.preview_images
+      assert_equal record['supportedRegions'], product.supported_regions
+      assert_equal record['supportedOperationCenters'], product.supported_operation_centers
+    end
+
+    it 'links to other things' do
+      product = JD::Model::ContributionProduct.new(record)
+
+      ['self', 'contribution_definition'].each do |association|
+        assert_equal link_for(association), product.links[association]
+      end
+    end
+
+    it 'accepts an optional accessor' do
+      mock_accessor = 'mock-accessor'
+
+      asset = JD::Model::ContributionProduct.new(record, mock_accessor)
+      assert_equal mock_accessor, asset.accessor
+    end
+  end
+end

data/test/lib/my_john_deere_api/model/field_test.rb

@@ -8,16 +8,13 @@ describe 'MyJohnDeereApi::Model::Field' do
       "archived"=>false,
       "id"=>"123456",
       "links"=>[
-        {"@type"=>"Link", "rel"=>"self", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/fields/123456"},
-        {"@type"=>"Link", "rel"=>"clients", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/fields/123456/clients"},
-        {"@type"=>"Link", "rel"=>"notes", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/fields/123456/notes"},
+        {"@type"=>"Link", "rel"=>"self", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/fields/#{field_id}"},
+        {"@type"=>"Link", "rel"=>"clients", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/fields/#{field_id}/clients"},
+        {"@type"=>"Link", "rel"=>"notes", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/fields/#{field_id}/notes"},
       ]
     }
   end
 
-  let(:client) { JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET]) }
-  let(:accessor) { VCR.use_cassette('catalog') { client.send(:accessor) } }
-
   describe '#initialize' do
     def link_for label
       record['links'].detect{|link| link['rel'] == label}['uri'].gsub('https://sandboxapi.deere.com/platform', '')
@@ -42,10 +39,10 @@ describe 'MyJohnDeereApi::Model::Field' do
     end
 
     it 'accepts an optional accessor' do
-      accessor = 'mock-accessor'
+      mock_accessor = 'mock-accessor'
 
-      field = JD::Model::Field.new(record, accessor)
-      assert_equal accessor, field.accessor
+      field = JD::Model::Field.new(record, mock_accessor)
+      assert_equal mock_accessor, field.accessor
     end
   end
 
@@ -54,7 +51,7 @@ describe 'MyJohnDeereApi::Model::Field' do
       accessor
       organization = VCR.use_cassette('get_organizations') { client.organizations.first }
       field = VCR.use_cassette('get_fields') { organization.fields.first }
-      flags = VCR.use_cassette('get_flags') { field.flags }
+      flags = VCR.use_cassette('get_flags') { field.flags.all }
 
       assert_kind_of Array, flags
 
@@ -75,7 +72,7 @@ describe 'MyJohnDeereApi::Model::Field' do
   describe 'private #organization_id' do
     it "infers the organization_id from links" do
       field = JD::Model::Field.new(record)
-      assert_equal '123456', field.send(:organization_id)
+      assert_equal organization_id, field.send(:organization_id)
     end
   end
 end

data/test/lib/my_john_deere_api/model/flag_test.rb

@@ -11,7 +11,7 @@ describe 'MyJohnDeereApi::Model::Flag' do
       "notes"=>"Our flag is a very, very, very nice flag!",
       "id"=>"123456",
       "links"=>[
-        {"@type"=>"Link", "rel"=>"field", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/fields/123456"},
+        {"@type"=>"Link", "rel"=>"field", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/fields/#{field_id}"},
         {"@type"=>"Link", "rel"=>"createdBy", "uri"=>"https://sandboxapi.deere.com/platform/users/bobsmith"},
         {"@type"=>"Link", "rel"=>"lastModifiedBy", "uri"=>"https://sandboxapi.deere.com/platform/users/jonsmith"},
       ]

data/test/lib/my_john_deere_api/model/organization_test.rb

@@ -9,28 +9,25 @@ describe 'MyJohnDeereApi::Model::Organization' do
       "member"=>true,
       "id"=>"123456",
       "links"=>[
-        {"@type"=>"Link", "rel"=>"self", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456"},
-        {"@type"=>"Link", "rel"=>"machines", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/machines"},
-        {"@type"=>"Link", "rel"=>"wdtCapableMachines", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/machines?capability=wdt"},
-        {"@type"=>"Link", "rel"=>"files", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/files"},
-        {"@type"=>"Link", "rel"=>"transferableFiles", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/files?transferable=true"},
-        {"@type"=>"Link", "rel"=>"uploadFile", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/files"},
-        {"@type"=>"Link", "rel"=>"sendFileToMachine", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/fileTransfers"},
-        {"@type"=>"Link", "rel"=>"addMachine", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/machines"},
-        {"@type"=>"Link", "rel"=>"addField", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/fields"},
-        {"@type"=>"Link", "rel"=>"assets", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/assets"},
-        {"@type"=>"Link", "rel"=>"fields", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/fields"},
-        {"@type"=>"Link", "rel"=>"farms", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/farms"},
-        {"@type"=>"Link", "rel"=>"boundaries", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/boundaries"},
-        {"@type"=>"Link", "rel"=>"clients", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/clients"},
-        {"@type"=>"Link", "rel"=>"controllers", "uri"=>"https://sandboxapi.deere.com/platform/organizations/123456/orgController"}
+        {"@type"=>"Link", "rel"=>"self", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}"},
+        {"@type"=>"Link", "rel"=>"machines", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/machines"},
+        {"@type"=>"Link", "rel"=>"wdtCapableMachines", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/machines?capability=wdt"},
+        {"@type"=>"Link", "rel"=>"files", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/files"},
+        {"@type"=>"Link", "rel"=>"transferableFiles", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/files?transferable=true"},
+        {"@type"=>"Link", "rel"=>"uploadFile", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/files"},
+        {"@type"=>"Link", "rel"=>"sendFileToMachine", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/fileTransfers"},
+        {"@type"=>"Link", "rel"=>"addMachine", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/machines"},
+        {"@type"=>"Link", "rel"=>"addField", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/fields"},
+        {"@type"=>"Link", "rel"=>"assets", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/assets"},
+        {"@type"=>"Link", "rel"=>"fields", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/fields"},
+        {"@type"=>"Link", "rel"=>"farms", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/farms"},
+        {"@type"=>"Link", "rel"=>"boundaries", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/boundaries"},
+        {"@type"=>"Link", "rel"=>"clients", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/clients"},
+        {"@type"=>"Link", "rel"=>"controllers", "uri"=>"https://sandboxapi.deere.com/platform/organizations/#{organization_id}/orgController"}
       ]
     }
   end
 
-  let(:client) { JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET]) }
-  let(:accessor) { VCR.use_cassette('catalog') { client.send(:accessor) } }
-
   describe '#initialize(record, accessor = nil)' do
     def link_for label
       record['links'].detect{|link| link['rel'] == label}['uri'].gsub('https://sandboxapi.deere.com/platform', '')
@@ -55,10 +52,10 @@ describe 'MyJohnDeereApi::Model::Organization' do
     end
 
     it 'accepts an optional accessor' do
-      accessor = 'mock-accessor'
+      mock_accessor = 'mock-accessor'
 
-      organization = JD::Model::Organization.new(record, accessor)
-      assert_equal accessor, organization.accessor
+      organization = JD::Model::Organization.new(record, mock_accessor)
+      assert_equal mock_accessor, organization.accessor
     end
   end
 
@@ -66,7 +63,7 @@ describe 'MyJohnDeereApi::Model::Organization' do
     it 'returns a collection of fields for this organization' do
       accessor
       organization = VCR.use_cassette('get_organizations') { client.organizations.first }
-      fields = VCR.use_cassette('get_fields') { organization.fields }
+      fields = VCR.use_cassette('get_fields') { organization.fields.all }
 
       assert_kind_of Array, fields
 

data/test/lib/my_john_deere_api/model_test.rb

@@ -14,6 +14,10 @@ describe 'MyJohnDeereApi::Model' do
       assert JD::Model::AssetLocation
     end
 
+    it 'loads Model::ContributionProduct' do
+      assert JD::Model::ContributionProduct
+    end
+
     it 'loads Model::Organization' do
       assert JD::Model::Organization
     end

data/test/lib/my_john_deere_api/request/collection/asset_locations_test.rb

@@ -3,14 +3,6 @@ require 'yaml'
 require 'json'
 
 describe 'MyJohnDeereApi::Request::Collection::AssetLocations' do
-  let(:asset_id) do
-    contents = File.read('test/support/vcr/get_assets.yml')
-    body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
-    JSON.parse(body)['values'].first['id']
-  end
-
-  let(:client) { JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET]) }
-  let(:accessor) { VCR.use_cassette('catalog') { client.send(:accessor) } }
   let(:collection) { JD::Request::Collection::AssetLocations.new(accessor, asset: asset_id) }
   let(:object) { collection }
 
@@ -22,10 +14,10 @@ describe 'MyJohnDeereApi::Request::Collection::AssetLocations' do
     end
 
     it 'accepts associations' do
-      collection = JD::Request::Collection::AssetLocations.new(accessor, asset: '123')
+      collection = JD::Request::Collection::AssetLocations.new(accessor, asset: asset_id)
 
       assert_kind_of Hash, collection.associations
-      assert_equal '123', collection.associations[:asset]
+      assert_equal asset_id, collection.associations[:asset]
     end
   end
 
@@ -50,40 +42,8 @@ describe 'MyJohnDeereApi::Request::Collection::AssetLocations' do
   end
 
   describe '#create(attributes)' do
-    let(:asset_id) { ENV['ASSET_ID'] }
-    let(:timestamp) { DateTime.parse(timestamp_string) }
-    let(:timestamp_string) { '2020-01-21T10:49:00Z' }
-    let(:coordinates) { [-103.115633, 41.670166] }
-
-    let(:geometry) do
-      {
-        type: 'Feature',
-        geometry: {
-          geometries: [
-            coordinates: coordinates,
-            type: 'Point'
-          ],
-          type: 'GeometryCollection'
-        }
-      }
-    end
-
-    let(:measurement_data) do
-      [
-        {
-          name: 'Temperature',
-          value: '68.0',
-          unit: 'F'
-        }
-      ]
-    end
-
     it 'creates a new asset with the given attributes' do
-      attributes = {
-        timestamp: timestamp,
-        geometry: geometry,
-        measurement_data: measurement_data
-      }
+      attributes = CONFIG.asset_location_attributes
 
       object = VCR.use_cassette('post_asset_locations') { collection.create(attributes) }
 
@@ -91,20 +51,21 @@ describe 'MyJohnDeereApi::Request::Collection::AssetLocations' do
 
       # API returns seconds with decimals, even though they're always zero
       integer_stamp = DateTime.parse(object.timestamp).strftime('%Y-%m-%dT%H:%M:%SZ')
+      expected_stamp = DateTime.parse(attributes[:timestamp]).strftime('%Y-%m-%dT%H:%M:%SZ')
 
       # API returns string keys and an extra '@type' key
       object_measurement_data = object.measurement_data.first.transform_keys{|k| k.to_sym}.slice(:name, :value, :unit)
 
-      assert_equal timestamp_string, integer_stamp
-      assert_equal geometry.to_json, object.geometry.to_json
-      assert_equal measurement_data.first, object_measurement_data
+      assert_equal expected_stamp, integer_stamp
+      assert_equal attributes[:geometry].to_json, object.geometry.to_json
+      assert_equal attributes[:measurement_data].first, object_measurement_data
     end
   end
 
   describe '#count' do
     let(:server_response) do
       contents = File.read('test/support/vcr/get_asset_locations.yml')
-      body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
+      body = YAML.load(contents)['http_interactions'].last['response']['body']['string']
       JSON.parse(body)
     end
 
@@ -120,7 +81,7 @@ describe 'MyJohnDeereApi::Request::Collection::AssetLocations' do
   describe 'results' do
     let(:location_timestamps) do
       contents = File.read('test/support/vcr/get_asset_locations.yml')
-      body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
+      body = YAML.load(contents)['http_interactions'].last['response']['body']['string']
       JSON.parse(body)['values'].map{|v| v['timestamp']}
     end
 

data/test/lib/my_john_deere_api/request/collection/assets_test.rb

@@ -3,14 +3,6 @@ require 'yaml'
 require 'json'
 
 describe 'MyJohnDeereApi::Request::Collection::Assets' do
-  let(:organization_id) do
-    contents = File.read('test/support/vcr/get_organizations.yml')
-    body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
-    JSON.parse(body)['values'].first['id']
-  end
-
-  let(:client) { JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET]) }
-  let(:accessor) { VCR.use_cassette('catalog') { client.send(:accessor) } }
   let(:collection) { JD::Request::Collection::Assets.new(accessor, organization: organization_id) }
   let(:object) { collection }
 
@@ -22,10 +14,10 @@ describe 'MyJohnDeereApi::Request::Collection::Assets' do
     end
 
     it 'accepts associations' do
-      collection = JD::Request::Collection::Assets.new(accessor, organization: '123')
+      collection = JD::Request::Collection::Assets.new(accessor, organization: organization_id)
 
       assert_kind_of Hash, collection.associations
-      assert_equal '123', collection.associations[:organization]
+      assert_equal organization_id, collection.associations[:organization]
     end
   end
 
@@ -49,33 +41,19 @@ describe 'MyJohnDeereApi::Request::Collection::Assets' do
   end
 
   describe '#create(attributes)' do
-    let(:title) { 'i like turtles' }
-    let(:category) { 'DEVICE' }
-    let(:type) { 'SENSOR' }
-    let(:subtype) { 'ENVIRONMENTAL' }
-
     it 'creates a new asset with the given attributes' do
-      attributes = {
-        contribution_definition_id: ENV['CONTRIBUTION_DEFINITION_ID'],
-        title: title,
-        asset_category: category,
-        asset_type: type,
-        asset_sub_type: subtype
-      }
-
+      attributes = CONFIG.asset_attributes
       object = VCR.use_cassette('post_assets') { collection.create(attributes) }
 
       assert_kind_of JD::Model::Asset, object
-      assert_equal title, object.title
-      assert_equal category, object.asset_category
-      assert_equal type, object.asset_type
-      assert_equal subtype, object.asset_sub_type
+      assert_equal attributes[:title], object.title
+      assert_equal attributes[:asset_category], object.asset_category
+      assert_equal attributes[:asset_type], object.asset_type
+      assert_equal attributes[:asset_sub_type], object.asset_sub_type
     end
   end
 
   describe '#find(asset_id)' do
-    let(:asset_id) { '123' }
-
     it 'retrieves the asset' do
       asset = VCR.use_cassette('get_asset') { collection.find(asset_id) }
       assert_kind_of JD::Model::Asset, asset
@@ -85,7 +63,7 @@ describe 'MyJohnDeereApi::Request::Collection::Assets' do
   describe '#count' do
     let(:server_response) do
       contents = File.read('test/support/vcr/get_assets.yml')
-      body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
+      body = YAML.load(contents)['http_interactions'].last['response']['body']['string']
       JSON.parse(body)
     end
 
@@ -101,7 +79,7 @@ describe 'MyJohnDeereApi::Request::Collection::Assets' do
   describe 'results' do
     let(:asset_titles) do
       contents = File.read('test/support/vcr/get_assets.yml')
-      body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
+      body = YAML.load(contents)['http_interactions'].last['response']['body']['string']
       JSON.parse(body)['values'].map{|v| v['title']}
     end
 

data/test/lib/my_john_deere_api/request/collection/base_test.rb

@@ -1,9 +1,6 @@
 require 'support/helper'
 
 describe 'MyJohnDeereApi::Request::Collection::Base' do
-  let(:client) { JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET]) }
-  let(:accessor) { VCR.use_cassette('catalog') { client.send(:accessor) } }
-
   describe '#initialize(access_token)' do
     it 'accepts an access token' do
       collection = JD::Request::Collection::Base.new(accessor)
@@ -11,10 +8,10 @@ describe 'MyJohnDeereApi::Request::Collection::Base' do
     end
 
     it 'accepts associations' do
-      collection = JD::Request::Collection::Base.new(accessor, organization: '123')
+      collection = JD::Request::Collection::Base.new(accessor, organization: organization_id)
 
       assert_kind_of Hash, collection.associations
-      assert_equal '123', collection.associations[:organization]
+      assert_equal organization_id, collection.associations[:organization]
     end
   end
 

data/test/lib/my_john_deere_api/request/collection/contribution_products_test.rb

@@ -0,0 +1,88 @@
+require 'support/helper'
+require 'yaml'
+require 'json'
+
+describe 'MyJohnDeereApi::Request::Collection::ContributionProducts' do
+  let(:klass) { MyJohnDeereApi::Request::Collection::ContributionProducts }
+
+  let(:collection) { klass.new(accessor, organization: organization_id) }
+  let(:object) { collection }
+
+  inherits_from JD::Request::Collection::Base
+
+  describe '#initialize(access_token)' do
+    it 'accepts an access token' do
+      assert_kind_of OAuth::AccessToken, collection.accessor
+    end
+
+    it 'accepts associations' do
+      collection = klass.new(accessor, organization: organization_id)
+
+      assert_kind_of Hash, collection.associations
+      assert_equal organization_id, collection.associations[:organization]
+    end
+  end
+
+  describe '#resource' do
+    it 'returns /contributionProducts' do
+      assert_equal "/contributionProducts?clientControlled=true", collection.resource
+    end
+  end
+
+  describe '#all' do
+    it 'returns all records' do
+      all = VCR.use_cassette('get_contribution_products') { collection.all }
+
+      assert_kind_of Array, all
+      assert_equal collection.count, all.size
+
+      all.each do |item|
+        assert_kind_of JD::Model::ContributionProduct, item
+      end
+    end
+  end
+
+  describe '#count' do
+    let(:server_response) do
+      contents = File.read('test/support/vcr/get_contribution_products.yml')
+      body = YAML.load(contents)['http_interactions'].last['response']['body']['string']
+      JSON.parse(body)
+    end
+
+    let(:server_count) { server_response['total'] }
+
+    it 'returns the total count of records in the collection' do
+      count = VCR.use_cassette('get_contribution_products') { collection.count }
+
+      assert_equal server_count, count
+    end
+  end
+
+  describe 'results' do
+    let(:product_names) do
+      contents = File.read('test/support/vcr/get_contribution_products.yml')
+      body = YAML.load(contents)['http_interactions'].last['response']['body']['string']
+
+      JSON.parse(body)['values'].map{|v| v['marketPlaceName']}
+    end
+
+    it 'returns all records as a single enumerator' do
+      count = VCR.use_cassette('get_contribution_products') { collection.count }
+      names = VCR.use_cassette('get_contribution_products') { collection.map(&:market_place_name) }
+
+      assert_kind_of Array, names
+      assert_equal count, names.size
+
+      product_names.each do |expected_name|
+        assert_includes names, expected_name
+      end
+    end
+  end
+
+  describe '#find(contribution_product_id)' do
+    it 'retrieves the asset' do
+      product = VCR.use_cassette('get_contribution_product') { collection.find(contribution_product_id) }
+      assert_kind_of JD::Model::ContributionProduct, product
+    end
+  end
+end

data/test/lib/my_john_deere_api/request/collection/fields_test.rb

@@ -3,14 +3,6 @@ require 'yaml'
 require 'json'
 
 describe 'MyJohnDeereApi::Request::Collection::Fields' do
-  let(:organization_id) do
-    contents = File.read('test/support/vcr/get_organizations.yml')
-    body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
-    JSON.parse(body)['values'].first['id']
-  end
-
-  let(:client) { JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET]) }
-  let(:accessor) { VCR.use_cassette('catalog') { client.send(:accessor) } }
   let(:collection) { JD::Request::Collection::Fields.new(accessor, organization: organization_id) }
   let(:object) { collection }
 
@@ -22,10 +14,10 @@ describe 'MyJohnDeereApi::Request::Collection::Fields' do
     end
 
     it 'accepts associations' do
-      collection = JD::Request::Collection::Fields.new(accessor, organization: '123')
+      collection = JD::Request::Collection::Fields.new(accessor, organization: organization_id)
 
       assert_kind_of Hash, collection.associations
-      assert_equal '123', collection.associations[:organization]
+      assert_equal organization_id, collection.associations[:organization]
     end
   end
 
@@ -51,7 +43,7 @@ describe 'MyJohnDeereApi::Request::Collection::Fields' do
   describe '#count' do
     let(:server_response) do
       contents = File.read('test/support/vcr/get_fields.yml')
-      body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
+      body = YAML.load(contents)['http_interactions'].last['response']['body']['string']
       JSON.parse(body)
     end
 
@@ -67,7 +59,7 @@ describe 'MyJohnDeereApi::Request::Collection::Fields' do
   describe 'results' do
     let(:field_names) do
       contents = File.read('test/support/vcr/get_fields.yml')
-      body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
+      body = YAML.load(contents)['http_interactions'].last['response']['body']['string']
       JSON.parse(body)['values'].map{|v| v['name']}
     end
 

data/test/lib/my_john_deere_api/request/collection/flags_test.rb

@@ -3,20 +3,6 @@ require 'yaml'
 require 'json'
 
 describe 'MyJohnDeereApi::Request::Collection::Flags' do
-  let(:organization_id) do
-    contents = File.read('test/support/vcr/get_organizations.yml')
-    body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
-    JSON.parse(body)['values'].first['id']
-  end
-
-  let(:field_id) do
-    contents = File.read('test/support/vcr/get_fields.yml')
-    body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
-    JSON.parse(body)['values'].first['id']
-  end
-
-  let(:client) { JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET]) }
-  let(:accessor) { VCR.use_cassette('catalog') { client.send(:accessor) } }
   let(:collection) { JD::Request::Collection::Flags.new(accessor, organization: organization_id, field: field_id) }
   let(:object) { collection }
 
@@ -28,11 +14,11 @@ describe 'MyJohnDeereApi::Request::Collection::Flags' do
     end
 
     it 'accepts associations' do
-      collection = JD::Request::Collection::Flags.new(accessor, organization: '123', field: '456')
+      collection = JD::Request::Collection::Flags.new(accessor, organization: organization_id, field: field_id)
 
       assert_kind_of Hash, collection.associations
-      assert_equal '123', collection.associations[:organization]
-      assert_equal '456', collection.associations[:field]
+      assert_equal organization_id, collection.associations[:organization]
+      assert_equal field_id, collection.associations[:field]
     end
   end
 
@@ -58,7 +44,7 @@ describe 'MyJohnDeereApi::Request::Collection::Flags' do
   describe '#count' do
     let(:server_response) do
       contents = File.read('test/support/vcr/get_flags.yml')
-      body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
+      body = YAML.load(contents)['http_interactions'].last['response']['body']['string']
       JSON.parse(body)
     end
 
@@ -74,7 +60,7 @@ describe 'MyJohnDeereApi::Request::Collection::Flags' do
   describe 'results' do
     let(:flag_geometries) do
       contents = File.read('test/support/vcr/get_flags.yml')
-      body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
+      body = YAML.load(contents)['http_interactions'].last['response']['body']['string']
       JSON.parse(body)['values'].map{|v| JSON.parse(v['geometry'])}
     end
 

data/test/lib/my_john_deere_api/request/collection/organizations_test.rb

@@ -3,8 +3,6 @@ require 'yaml'
 require 'json'
 
 describe 'MyJohnDeereApi::Request::Collection::Organizations' do
-  let(:client) { JD::Client.new(API_KEY, API_SECRET, environment: :sandbox, access: [ACCESS_TOKEN, ACCESS_SECRET]) }
-  let(:accessor) { VCR.use_cassette('catalog') { client.send(:accessor) } }
   let(:collection) { JD::Request::Collection::Organizations.new(accessor) }
   let(:object) { collection }
 
@@ -38,7 +36,7 @@ describe 'MyJohnDeereApi::Request::Collection::Organizations' do
   describe '#count' do
     let(:server_response) do
       contents = File.read('test/support/vcr/get_organizations.yml')
-      body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
+      body = YAML.load(contents)['http_interactions'].last['response']['body']['string']
       JSON.parse(body)
     end
 
@@ -54,7 +52,7 @@ describe 'MyJohnDeereApi::Request::Collection::Organizations' do
   describe 'pagination' do
     let(:organization_names) do
       contents = File.read('test/support/vcr/get_organizations.yml')
-      body = YAML.load(contents)['http_interactions'].first['response']['body']['string']
+      body = YAML.load(contents)['http_interactions'].last['response']['body']['string']
       JSON.parse(body)['values'].map{|v| v['name']}
     end
 

data/test/lib/my_john_deere_api/request/collection_test.rb

@@ -14,6 +14,10 @@ describe 'MyJohnDeereApi::Request::Collection' do
       assert JD::Request::Collection::AssetLocations
     end
 
+    it 'loads Request::Collection::ContributionProducts' do
+      assert JD::Request::Collection::ContributionProducts
+    end
+
     it 'loads Request::Collection::Organizations' do
       assert JD::Request::Collection::Organizations
     end