ruby-jss 2.0.0a10 → 2.0.0a11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfe89a0e0761b3ea3c55a8195ab1efc45edbf7fff6245221efc66e980c718140
-  data.tar.gz: 13a7fde978d5f853d832cfda62191973fbf212bee6390cad34aeeca40e1cd8d0
+  metadata.gz: 89a063540145b18ab23771f87ad6eb8db80c154e911138b75a7a233117fb6dc6
+  data.tar.gz: 139bc4655da8a6a1e4bed21add476f6bfaa844dbda4fb0e477fdcee45079cc9e
 SHA512:
-  metadata.gz: ef651918fdd27bc4abfd190088b4844baecdeea228a918afcadbcbf792da0883e0e4697794535d69f64d28cf089470ff79a2377a4f24c3eda9523bc4a31feb12
-  data.tar.gz: 046051da8e0bab5253f6ded824bcbd4960bc347c41b0993e03d335c515062690efa68a3268ff484af7659d14c8645413ac7017345c0afec89ad14d1e76779fd1
+  metadata.gz: 33d23b52e0f0bb2f42a4a606ae34288b4b7ceb35e3d051ccb1281456709cdee7d4bcaea26681f30126239e30bde8de55bc550fe021d2e59a9cd0f05fdeb40d65
+  data.tar.gz: b8b8c46c351833c47493ad2512349b952522d2916bcac4b0143a0c49aa140187635be582ad5971da0a63e599fbd263900eecb01bce24b88da6f88a8457ea82fc

data/README-2.0.0.md

@@ -35,6 +35,7 @@ These changes have been in mind for some time, but the ability (soon to be requi
   - [Jamf::Connection instance methods `#next_refresh`, `#secs_to_refresh`, &  `#time_to_refresh`](#jamfconnection-instance-methods-next_refresh-secs_to_refresh---time_to_refresh)
   - [Cross-object validation in setters](#cross-object-validation-in-setters)
   - [.fetch :random](#fetch-random)
+- [Documentation](#documentation)
 - [How to install for testing](#how-to-install-for-testing)
 - [Contact](#contact)
 
@@ -42,7 +43,9 @@ These changes have been in mind for some time, but the ability (soon to be requi
 
 ## Requirements
 
-ruby-jss 2.0.0 requires ruby 2.7 or higher , and a Jamf Pro server running version 10.35 or higher.
+ruby-jss 2.0 requires ruby 2.6.3 or higher, and a Jamf Pro server running version 10.35 or higher.
+
+This means it will work with the OS-supplied /usr/bin/ruby in macOS 10.15 Catalina and above, until Apple removes ruby from the OS.
 
 ## High level changes
 
@@ -300,6 +303,11 @@ The last point is very important.  Right now, in order to be able to manipulate
 
 You can still fetch random objects from a collection, but use `.fetch random: true`. The older `.fetch :random` is deprecated and will be removed.
 
+## Documentation
+
+The YARD documentation for v2.0.0 is available before release in the [github.io site for ruby-jss](http://pixaranimationstudios.github.io/ruby-jss/docs/v2.x/index.html).
+
+All the documentation for ruby-jss is in need of updating, from the top-level README to the auto-generated YARD docs.  If you have questions that aren't answered there, please reach out (see Contact, below)
 
 ## How to install for testing
 

data/lib/jamf/api/classic/api_objects/criteriable.rb

@@ -153,7 +153,7 @@ module Jamf
     #
     def parse_criteria
       @criteria = Jamf::Criteriable::Criteria.new
-      @criteria.criteria = @init_data[:criteria].map { |c| Jamf::Criteriable::Criterion.new c } if @init_data[:criteria]
+      @criteria.criteria = @init_data[:criteria].map { |c| Jamf::Criteriable::Criterion.new **c } if @init_data[:criteria]
 
       @criteria.container = self
     end

data/lib/jamf/api/classic/base_classes/advanced_search.rb

@@ -144,7 +144,7 @@ module Jamf
     # @see APIObject#initialize
     #
     def initialize(**args)
-      super
+      super **args
 
       # @init_data now has the raw data
       # so fill in our attributes or set defaults

data/lib/jamf/api/connection.rb

@@ -198,7 +198,7 @@ module Jamf
     def to_s
       return 'not connected' unless connected?
 
-      if name.start_with? "#{user}@"
+      if name.to_s.start_with? "#{user}@"
         name
       else
         "#{user}@#{host}:#{port}, name: #{name}"

data/lib/jamf/api/jamf_pro/base_classes/oapi_object.rb

@@ -60,6 +60,12 @@ module Jamf
       self::OAPI_PROPERTIES.select { |_attr, deets| deets[:required] }.keys
     end
 
+    # have we already parsed our OAPI_PROPERTIES? If so,
+    # we shoudn't do it again, an this can be used to check
+    def self.oapi_properties_parsed?
+      @oapi_properties_parsed
+    end
+
     # create getters and setters for subclasses of APIObject
     # based on their OAPI_PROPERTIES Hash.
     #

data/lib/jamf/api/jamf_pro/mixins/prestage.rb

@@ -139,6 +139,11 @@ module Jamf
       # Is the given serialNumber assigned to any prestage, or to the
       # given prestage if a prestage is specified?
       #
+      # This uses .serials_by_prestage_id, the class-level scope path which
+      # gets a hash of all assigned SNS => the id of the prestage they are
+      # assigned to. The instance#assigned? method uses a different path
+      # which returnds more data in an OAPI object.
+      #
       # NOTE: If a serial number isn't assigned to any prestage, it may really be
       # unassigned or it may not exist in your ADE. To see if a SN exists in one
       # of your Device Enrollment instances, use Jamf::DeviceEnrollment.include?
@@ -269,6 +274,8 @@ module Jamf
 
     # The scope data for this prestage
     #
+    # TODO: retain this caching?
+    #
     # @param refresh[Boolean] reload fromthe API?
     #
     # @return [PrestageScope]
@@ -278,6 +285,8 @@ module Jamf
       return @scope if @scope
 
       @scope = INSTANCE_SCOPE_OBJECT.new @cnx.get(scope_path)
+      # TODO: is this the best way to deal with fetching a scope that
+      # is more updated than the rest of the object?
       unless @scope.versionLock == @versionLock
         raise Jamf::VersionLockError, "The #{self.class} '#{name}' has been modified since it was fetched. Please refetch and try again"
       end
@@ -286,12 +295,18 @@ module Jamf
     end
 
     # @return [Array<String>] the serialnumbers assigned to this prestage
-    def assigned_sns
-      scope.assignments.map(&:serialNumber)
+    def assigned_sns(refresh: false)
+      return @assigned_sns if @assigned_sns
+
+      @assigned_sns = nil if refresh
+      @assigned_sns = scope.assignments.map(&:serialNumber)
     end
 
     # Is this SN assigned to this prestage?
     #
+    # This method uses the instance's scope object, from a different API
+    # path than the class-level .assigned? method.
+    #
     # @param sn[String] the sn to look for
     #
     # @return [Boolean]
@@ -336,11 +351,6 @@ module Jamf
       @scope_path ||= "#{get_path}/#{SCOPE_PATH}"
     end
 
-    def scope
-      data = @cnx.jp_get(scope_path)
-      INSTANCE_SCOPE_OBJECT.new **data
-    end
-
   end # class
 
 end # module

data/lib/jamf/constants.rb

@@ -30,7 +30,7 @@ module Jamf
   module Constants
 
     # The minimum Ruby version needed for ruby-jss
-    MINIMUM_RUBY_VERSION = '2.7.0'.freeze
+    MINIMUM_RUBY_VERSION = '2.6.3'.freeze
 
     # These are handy for testing values without making new arrays, strings, etc every time.
     TRUE_FALSE = [true, false].freeze

data/lib/jamf/version.rb

@@ -27,6 +27,6 @@
 module Jamf
 
   ### The version of ruby-jss
-  VERSION = '2.0.0a10'.freeze
+  VERSION = '2.0.0a11'.freeze
 
 end # module

data/lib/zeitwerk_config.rb

@@ -123,17 +123,18 @@ def setup_zeitwerk_loader(loader)
     # Parse OAPI_PROPERTIES into getters and setters for subclasses of
     # OAPIObject in the JPAPI.
     # The class we just loaded must have this method and constant
-    # and the constant must be defined directly in the file we just loaded.
+    # and the method must not have run already for the class or any superclass.
     # This prevents running parse_oapi_properties again in subclasses that
     # don't need to do that
-    if value.respond_to?(:parse_oapi_properties) && \
+    if value.respond_to?(:oapi_properties_parsed?) && \
        defined?(value::OAPI_PROPERTIES) && \
-       abspath == value.const_source_location(:OAPI_PROPERTIES).first
+       !value.oapi_properties_parsed?
 
       parsed = value.parse_oapi_properties
       Jamf.load_msg "Parsed OAPI_PROPERTIES for #{value}" if parsed
     end
 
+
     # Generate the identifier list methods (.all_*) for subclasses of APIObject
     # in the Classic API
     if value.is_a?(Class) && value.superclass == Jamf::APIObject

data/test/lib/jamf_test/APITest.rb

@@ -41,25 +41,51 @@ module JamfTest
     end
 
     #####
-    def validate_hash(hash, has_key: nil, val_class: nil)
+    def validate_hash(hash, has_key: nil, class_for_has_key: nil, key_class: nil, val_class: nil)
       raise 'Value is not a Hash' unless hash.is_a? Hash
-      return unless has_key
 
-      raise "Hash does not have required key #{has_key}" unless hash.key? has_key
-      return unless val_class
+      if hash.empty?
+        say 'WARNING: Hash is empty! This may be OK depending on your environment'
+        return
+      end
+
+      if has_key
+        raise "Hash does not have required key #{has_key}" unless hash.key?(has_key)
+
+        say "Hash has key '#{has_key}'"
+        if class_for_has_key
+          val = hash[has_key]
+          raise "Value '#{val}' for key '#{has_key}' is a #{val.class} not #{class_for_has_key}" unless val.is_a?(class_for_has_key)
+
+          say "Value '#{val}' for key '#{has_key}' is a #{class_for_has_key}"
+        end
+      end
+
+      if key_class
+        key = hash.keys.sample
 
-      raise "Value for Hash key #{has_key} is not a #{val_class}" unless hash[has_key].is_a? val_class
+        raise "Hash key'#{key}' is a #{key.class} not #{key_class}" unless key.is_a?(key_class)
+
+        say "Hash keys are class: #{key_class}"
+      end
+
+      if val_class
+        val = hash.values.sample
+        raise "Hash value '#{val}' is a #{val.class} not #{val_class}" unless val.is_a?(val_class)
+
+        say "Hash value are class: #{val_class}"
+      end
     end
 
     #####
     def validate_array(ary, item_class: nil)
       raise 'Value is not an Array' unless ary.is_a? Array
-      return unless item_class
 
       if ary.empty?
-        puts 'WARNING: Array is empty! This may be OK depending on your environment'
+        say 'WARNING: Array is empty! This may be OK depending on your environment'
         return
       end
+      return unless item_class
 
       raise "Randomly chosen item from Array is not a #{item_class}" unless ary.sample.is_a? item_class
     end

data/test/lib/jamf_test/advanced_search.rb

@@ -0,0 +1,40 @@
+### Copyright 2022 Pixar
+
+###
+###    Licensed under the Apache License, Version 2.0 (the "Apache License")
+###    with the following modification; you may not use this file except in
+###    compliance with the Apache License and the following modification to it:
+###    Section 6. Trademarks. is deleted and replaced with:
+###
+###    6. Trademarks. This License does not grant permission to use the trade
+###       names, trademarks, service marks, or product names of the Licensor
+###       and its affiliates, except as required to comply with Section 4(c) of
+###       the License and to reproduce the content of the NOTICE file.
+###
+###    You may obtain a copy of the Apache License at
+###
+###        http://www.apache.org/licenses/LICENSE-2.0
+###
+###    Unless required by applicable law or agreed to in writing, software
+###    distributed under the Apache License with the above modification is
+###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+###    KIND, either express or implied. See the Apache License for the specific
+###    language governing permissions and limitations under the Apache License.
+###
+###
+
+module JamfTest
+
+  module AdvancedSearchTests
+
+    include JamfTest::CollectionTests
+
+    # run the tests
+    def run_class_tests
+      run_collection_tests do_object_tests: false
+
+    end
+
+  end # module
+
+end # module JamfTest

data/test/lib/jamf_test/collection_tests.rb

@@ -93,11 +93,12 @@ module JamfTest
       fetch_random
       return unless do_object_tests
 
-      # These methods are very basic and assume a simple object
+      # The methods below are very basic and assume a simple object
       # that can be created with only a 'name'.
       #
       # For anything more complex, they should be overridden in the classes that
       # mixin this module, since the details will be very different
+      # See inventory_preload_record.rb for an example
 
       create_new
       add_data_to_new
@@ -128,8 +129,7 @@ module JamfTest
 
       one_of_all = @cached_all.sample
 
-      validate_hash one_of_all, has_key: :id, val_class: id_class
-
+      validate_hash one_of_all, has_key: :id, class_for_has_key: id_class
     end
 
     #################
@@ -140,8 +140,6 @@ module JamfTest
         say "There are no #{collection_class} objects on the server, not testing sorted_all"
         return
       end
-
-
       sorted_desc = collection_class.all sort: 'id:desc'
       raise "#{collection_class}.all sort: 'id:desc' ; didn't work as expected" unless sorted_desc.first[:id].to_i >= sorted_desc.last[:id].to_i
 
@@ -182,7 +180,7 @@ module JamfTest
       identifiers.each do |ident|
         next if ident == :id
 
-        mth = ident.end_with?('s') ? "all_#{ident}es" : "all_#{ident}s"
+        mth = ident.to_s.end_with?('s') ? "all_#{ident}es" : "all_#{ident}s"
         collection_class.send mth
         say "Ran #{collection_class}.#{mth}"
       end

data/test/lib/jamf_test/prestage_tests.rb

@@ -0,0 +1,135 @@
+### Copyright 2022 Pixar
+
+###
+###    Licensed under the Apache License, Version 2.0 (the "Apache License")
+###    with the following modification; you may not use this file except in
+###    compliance with the Apache License and the following modification to it:
+###    Section 6. Trademarks. is deleted and replaced with:
+###
+###    6. Trademarks. This License does not grant permission to use the trade
+###       names, trademarks, service marks, or product names of the Licensor
+###       and its affiliates, except as required to comply with Section 4(c) of
+###       the License and to reproduce the content of the NOTICE file.
+###
+###    You may obtain a copy of the Apache License at
+###
+###        http://www.apache.org/licenses/LICENSE-2.0
+###
+###    Unless required by applicable law or agreed to in writing, software
+###    distributed under the Apache License with the above modification is
+###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+###    KIND, either express or implied. See the Apache License for the specific
+###    language governing permissions and limitations under the Apache License.
+###
+###
+
+module JamfTest
+
+  module PrestageTests
+
+    include JamfTest::CollectionTests
+
+    # run the tests
+    def run_class_tests
+      run_collection_tests do_object_tests: false
+
+      if @cached_all.empty?
+        say 'No ComputerPrestages defined, skipping remaining tests'
+        return
+      end
+
+      # class methods
+      fetch_default_prestage
+      all_serials_by_prestage_id
+      serials_for_prestage
+
+      unless @sampled_sn
+        say 'No serial numbers assigned to any prestage, cannot continue tests on this server.'
+        return
+      end
+
+      assigned_prestage_id
+      assigned_via_class
+
+      say 'NOTE: Not testing assign/unassign. Too much potential for havoc on prod. servers. Use IRB to test manually'
+
+      # instance methods
+      scope
+      assigned_via_scope
+    end
+
+    #########
+    def fetch_default_prestage
+      @default_computer_prestage = collection_class.default
+      say "Ran #{collection_class}.default to fetch the default Computer prestage"
+    end
+
+    #########
+    def all_serials_by_prestage_id
+      serials = collection_class.serials_by_prestage_id
+      say "Ran #{collection_class}.default to fetch the default Computer prestage"
+      validate_hash serials, key_class: String, val_class: String
+      @sampled_sn = serials.keys.sample
+      @sample_prestage_id = serials[@sampled_sn]
+    end
+
+    ###########
+    def serials_for_prestage
+      collection_class.serials_for_prestage @default_computer_prestage.id
+      say "Ran #{collection_class}.serials_for_prestage '#{@default_computer_prestage.id}'"
+
+      collection_class.serials_for_prestage @default_computer_prestage.displayName
+      say "Ran #{collection_class}.serials_for_prestage '#{@default_computer_prestage.displayName}'"
+    end
+
+    ##########
+    def assigned_prestage_id
+      looked_up_id = collection_class.assigned_prestage_id @sampled_sn, :refresh
+      say "Ran #{collection_class}.assiged_prestage_id '#{@sampled_sn}', :refresh"
+
+      if looked_up_id == @sample_prestage_id
+        say "Prestage id returned was '#{looked_up_id}' as expected"
+        return
+      end
+
+      raise "Prestage id returned was '#{looked_up_id}' but expected '#{@sample_prestage_id}'"
+    end
+
+    ##########
+    def assigned_via_class
+      assigned = collection_class.assigned? @sampled_sn, refresh: false
+      say "Ran #{collection_class}.assigned? '#{@sampled_sn}', refresh: false"
+      raise "Expected #{collection_class}.assigned? '#{@sampled_sn}' to return true, but got false" unless assigned
+
+      assigned = collection_class.assigned? 'NotA-Real-SerialNumber', refresh: false
+      say "Ran #{collection_class}.assigned? 'NotA-Real-SerialNumber', refresh: false"
+      raise "Expected #{collection_class}.assigned? 'NotA-Real-SerialNumber' to return false, but got true" if assigned
+    end
+
+    ###########
+    def scope
+      @default_computer_prestage_scope = @default_computer_prestage.scope
+      say "Ran #{collection_class}#scope on default prestage"
+      unless @default_computer_prestage_scope.is_a?(Jamf::OAPISchemas::PrestageScopeResponseV2)
+        raise 'Returned scope is not a Jamf::OAPISchemas::PrestageScopeResponseV2'
+      end
+
+      say 'Validating #assignments'
+      validate_array @default_computer_prestage_scope.assignments, item_class: Jamf::OAPISchemas::PrestageScopeAssignmentV2
+      say 'scope assignments are valid'
+    end
+
+    ##############
+    def assigned_via_scope
+      assigned = @default_computer_prestage.assigned? @sampled_sn
+      say "Ran @default_computer_prestage.assigned? '#{@sampled_sn}'"
+      raise "Expected @default_computer_prestage.assigned? '#{@sampled_sn}' to return true, but got false" unless assigned
+
+      assigned = @default_computer_prestage.assigned? 'NotA-Real-SerialNumber'
+      say "Ran @default_computer_prestage.assigned? 'NotA-Real-SerialNumber'"
+      raise "Expected @default_computer_prestage.assigned? 'NotA-Real-SerialNumber' to return false, but got true" if assigned
+    end
+
+  end # module
+
+end # module JamfTest

data/test/lib/jamf_test.rb

@@ -63,4 +63,10 @@ end # module JamfTest
 # load in the rest of the module
 libdir = Pathname.new File.dirname(__FILE__)
 moduledir = libdir + 'jamf_test'
-moduledir.children.each { |mf| load mf.to_s }
+
+# order matters, of course
+require "#{moduledir}/auth"
+require "#{moduledir}/APITest"
+require "#{moduledir}/collection_tests"
+require "#{moduledir}/prestage_tests"
+require "#{moduledir}/advanced_search"

data/test/tests/advanced_computer_search.rb

@@ -0,0 +1,36 @@
+### Copyright 2022 Pixar
+
+###
+###    Licensed under the Apache License, Version 2.0 (the "Apache License")
+###    with the following modification; you may not use this file except in
+###    compliance with the Apache License and the following modification to it:
+###    Section 6. Trademarks. is deleted and replaced with:
+###
+###    6. Trademarks. This License does not grant permission to use the trade
+###       names, trademarks, service marks, or product names of the Licensor
+###       and its affiliates, except as required to comply with Section 4(c) of
+###       the License and to reproduce the content of the NOTICE file.
+###
+###    You may obtain a copy of the Apache License at
+###
+###        http://www.apache.org/licenses/LICENSE-2.0
+###
+###    Unless required by applicable law or agreed to in writing, software
+###    distributed under the Apache License with the above modification is
+###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+###    KIND, either express or implied. See the Apache License for the specific
+###    language governing permissions and limitations under the Apache License.
+###
+###
+
+module JamfTest
+
+  class AdvancedComputerSearch < JamfTest::APITest
+
+    include JamfTest::AdvancedSearchTests
+
+    COLLECTION_CLASS = Jamf::AdvancedComputerSearch
+
+  end # class
+
+end # module JamfTest

data/test/tests/advanced_mobile_device_search.rb

@@ -0,0 +1,36 @@
+### Copyright 2022 Pixar
+
+###
+###    Licensed under the Apache License, Version 2.0 (the "Apache License")
+###    with the following modification; you may not use this file except in
+###    compliance with the Apache License and the following modification to it:
+###    Section 6. Trademarks. is deleted and replaced with:
+###
+###    6. Trademarks. This License does not grant permission to use the trade
+###       names, trademarks, service marks, or product names of the Licensor
+###       and its affiliates, except as required to comply with Section 4(c) of
+###       the License and to reproduce the content of the NOTICE file.
+###
+###    You may obtain a copy of the Apache License at
+###
+###        http://www.apache.org/licenses/LICENSE-2.0
+###
+###    Unless required by applicable law or agreed to in writing, software
+###    distributed under the Apache License with the above modification is
+###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+###    KIND, either express or implied. See the Apache License for the specific
+###    language governing permissions and limitations under the Apache License.
+###
+###
+
+module JamfTest
+
+  class AdvancedMobileDeviceSearch < JamfTest::APITest
+
+    include JamfTest::AdvancedSearchTests
+
+    COLLECTION_CLASS = Jamf::AdvancedMobileDeviceSearch
+
+  end # class
+
+end # module JamfTest

data/test/tests/advanced_user_search.rb

@@ -0,0 +1,36 @@
+### Copyright 2022 Pixar
+
+###
+###    Licensed under the Apache License, Version 2.0 (the "Apache License")
+###    with the following modification; you may not use this file except in
+###    compliance with the Apache License and the following modification to it:
+###    Section 6. Trademarks. is deleted and replaced with:
+###
+###    6. Trademarks. This License does not grant permission to use the trade
+###       names, trademarks, service marks, or product names of the Licensor
+###       and its affiliates, except as required to comply with Section 4(c) of
+###       the License and to reproduce the content of the NOTICE file.
+###
+###    You may obtain a copy of the Apache License at
+###
+###        http://www.apache.org/licenses/LICENSE-2.0
+###
+###    Unless required by applicable law or agreed to in writing, software
+###    distributed under the Apache License with the above modification is
+###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+###    KIND, either express or implied. See the Apache License for the specific
+###    language governing permissions and limitations under the Apache License.
+###
+###
+
+module JamfTest
+
+  class AdvancedUserSearch < JamfTest::APITest
+
+    include JamfTest::AdvancedSearchTests
+
+    COLLECTION_CLASS = Jamf::AdvancedUserSearch
+
+  end # class
+
+end # module JamfTest

data/test/tests/computer_prestage.rb

@@ -0,0 +1,36 @@
+### Copyright 2022 Pixar
+
+###
+###    Licensed under the Apache License, Version 2.0 (the "Apache License")
+###    with the following modification; you may not use this file except in
+###    compliance with the Apache License and the following modification to it:
+###    Section 6. Trademarks. is deleted and replaced with:
+###
+###    6. Trademarks. This License does not grant permission to use the trade
+###       names, trademarks, service marks, or product names of the Licensor
+###       and its affiliates, except as required to comply with Section 4(c) of
+###       the License and to reproduce the content of the NOTICE file.
+###
+###    You may obtain a copy of the Apache License at
+###
+###        http://www.apache.org/licenses/LICENSE-2.0
+###
+###    Unless required by applicable law or agreed to in writing, software
+###    distributed under the Apache License with the above modification is
+###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+###    KIND, either express or implied. See the Apache License for the specific
+###    language governing permissions and limitations under the Apache License.
+###
+###
+
+module JamfTest
+
+  class ComputerPrestage < JamfTest::APITest
+
+    include JamfTest::PrestageTests
+
+    COLLECTION_CLASS = Jamf::ComputerPrestage
+
+  end # class
+
+end # module JamfTest

data/test/tests/inventory_preload_record.rb

@@ -42,7 +42,7 @@ module JamfTest
     def run_class_tests
       run_collection_tests do_object_tests: false
 
-      # object tests... some from the mixin, others overridden here
+      # custom object tests... some from the mixin, others overridden here
       create_new # in mixin
       add_data_to_new_with_failures
       save_new_with_failures
@@ -52,7 +52,7 @@ module JamfTest
         by_name: false,
         by_searchterm: true,
         by_ident: :serialNumber,
-        val_to_fetch: @cached_all.sample[:serialNumber]
+        val_to_fetch: TEST_SN
       ) # in mixin
       validate_fetched # in mixin
       modify_fetched

data/test/tests/mobile_device_prestage.rb

@@ -0,0 +1,37 @@
+### Copyright 2022 Pixar
+
+###
+###    Licensed under the Apache License, Version 2.0 (the "Apache License")
+###    with the following modification; you may not use this file except in
+###    compliance with the Apache License and the following modification to it:
+###    Section 6. Trademarks. is deleted and replaced with:
+###
+###    6. Trademarks. This License does not grant permission to use the trade
+###       names, trademarks, service marks, or product names of the Licensor
+###       and its affiliates, except as required to comply with Section 4(c) of
+###       the License and to reproduce the content of the NOTICE file.
+###
+###    You may obtain a copy of the Apache License at
+###
+###        http://www.apache.org/licenses/LICENSE-2.0
+###
+###    Unless required by applicable law or agreed to in writing, software
+###    distributed under the Apache License with the above modification is
+###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+###    KIND, either express or implied. See the Apache License for the specific
+###    language governing permissions and limitations under the Apache License.
+###
+###
+
+module JamfTest
+
+  class MobileDevicePrestage < JamfTest::APITest
+
+    include JamfTest::PrestageTests
+
+    COLLECTION_CLASS = Jamf::MobileDevicePrestage
+
+
+  end # class
+
+end # module JamfTest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jss
 version: !ruby/object:Gem::Version
-  version: 2.0.0a10
+  version: 2.0.0a11
 platform: ruby
 authors:
 - Chris Lasell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -807,12 +807,19 @@ files:
 - test/bin/runtests
 - test/lib/jamf_test.rb
 - test/lib/jamf_test/APITest.rb
+- test/lib/jamf_test/advanced_search.rb
 - test/lib/jamf_test/auth.rb
 - test/lib/jamf_test/collection_tests.rb
+- test/lib/jamf_test/prestage_tests.rb
+- test/tests/advanced_computer_search.rb
+- test/tests/advanced_mobile_device_search.rb
+- test/tests/advanced_user_search.rb
 - test/tests/category.rb
+- test/tests/computer_prestage.rb
 - test/tests/device_enrollment.rb
 - test/tests/inventory_preload_record.rb
 - test/tests/jp_building.rb
+- test/tests/mobile_device_prestage.rb
 - test/tests/policy.rb
 homepage: http://pixaranimationstudios.github.io/ruby-jss/
 licenses:
@@ -831,7 +838,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.6.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"