ruby-jss 1.6.4 → 2.0.0b1

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/{testhelper.rb → jamf_test.rb}

@@ -1,4 +1,4 @@
-### Copyright 2020 Pixar
+### Copyright 2022 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")
@@ -24,29 +24,26 @@
 ###
 
 # Methods and constants for the tests
-module JSSTestHelper
+module JamfTest
 
   TOP_PREFIX = '>>>>>'.freeze
-  TEST_PREFIX = '---->'.freeze
+  TEST_PREFIX = '-->'.freeze
 
   ERROR_PREFIX1 = '****-> ERROR in :'.freeze
   ERROR_PREFIX2 = '****->   '.freeze
 
-  module_function
-
-  def say(msg, from: :top)
+  def self.say(msg, from: :top)
     msgs = msg.is_a?(Array) ? msg : [msg]
     prefix =
       if from == :top
         TOP_PREFIX
       else
-        puts # for interlacing with minitest's dots
-        "-- #{from} #{TEST_PREFIX}"
+        "- #{from} #{TEST_PREFIX}"
       end
     msgs.each { |m| puts "#{prefix} #{m}" }
   end
 
-  def report(a_problem)
+  def self.report(a_problem)
     if a_problem.is_a? Exception
       puts caller_locations
       src = caller_locations(5..5).first
@@ -61,9 +58,15 @@ module JSSTestHelper
     puts " #{ERROR_PREFIX2} #{msg}"
   end
 
-end # module JSSTestHelper
+end # module JamfTest
 
 # load in the rest of the module
 libdir = Pathname.new File.dirname(__FILE__)
-moduledir = libdir + 'testhelper'
-moduledir.children.each { |mf| load mf.to_s }
+moduledir = libdir + 'jamf_test'
+
+# order matters, of course
+require "#{moduledir}/auth"
+require "#{moduledir}/APITest"
+require "#{moduledir}/collection_tests"
+require "#{moduledir}/prestage_tests"
+require "#{moduledir}/advanced_search"

data/{lib/jss/ruby_extensions.rb → test/tests/advanced_computer_search.rb}

@@ -1,4 +1,4 @@
-### Copyright 2020 Pixar
+### Copyright 2022 Pixar
 
 ###
 ###    Licensed under the Apache License, Version 2.0 (the "Apache License")
@@ -23,15 +23,14 @@
 ###
 ###
 
-### All monkey-patched convenience methods are either prefixed with "jss_"  or
-### if they are type coercions, "to_jss_"
-###
+module JamfTest
+
+  class AdvancedComputerSearch < JamfTest::APITest
+
+    include JamfTest::AdvancedSearchTests
+
+    COLLECTION_CLASS = Jamf::AdvancedComputerSearch
+
+  end # class
 
-require "jss/ruby_extensions/filetest.rb"
-require "jss/ruby_extensions/hash.rb"
-require "jss/ruby_extensions/ipaddr.rb"
-require "jss/ruby_extensions/object.rb"
-require "jss/ruby_extensions/pathname.rb"
-require "jss/ruby_extensions/time.rb"
-require "jss/ruby_extensions/string.rb"
-require "jss/ruby_extensions/array.rb"
+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/building.rb

@@ -0,0 +1,41 @@
+### 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 Building < JamfTest::APITest
+
+    include JamfTest::CollectionTests
+
+    COLLECTION_CLASS = Jamf::Building
+
+    # run the tests
+    def run_class_tests
+      run_collection_tests
+    end
+
+  end # class
+
+end # module JamfTest

data/test/tests/category.rb

@@ -0,0 +1,41 @@
+### 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 Category < JamfTest::APITest
+
+    include JamfTest::CollectionTests
+
+    COLLECTION_CLASS = Jamf::Category
+
+    # run the tests
+    def run_class_tests
+      run_collection_tests
+    end
+
+  end # class
+
+end # module JamfTest

data/test/tests/computer.rb

@@ -0,0 +1,41 @@
+### 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 Computer < JamfTest::APITest
+
+    include JamfTest::CollectionTests
+
+    COLLECTION_CLASS = Jamf::Computer
+
+    # run the tests
+    def run_class_tests
+      run_collection_tests do_object_tests: false
+    end
+
+  end # class
+
+end # module JamfTest

data/test/tests/computer_group.rb

@@ -0,0 +1,132 @@
+### 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 ComputerGroup < JamfTest::APITest
+
+    include JamfTest::CollectionTests
+
+    COLLECTION_CLASS = Jamf::ComputerGroup
+
+    # run the tests
+    def run_class_tests
+      run_collection_tests
+    end
+
+    #### Collection Test Overrides
+
+    ################
+    def create_new
+      @unsaved_new_object = collection_class.create name: test_object_name, type: :static
+      say "Created new Static #{collection_class}, to be saved in Jamf."
+    end
+
+    ################
+    def add_data_to_new
+      @all_comps_shuffled = Jamf::Computer.all.dup.shuffle
+      @comps_added_to_static_group = []
+
+      comp_1 = @all_comps_shuffled.shift
+      @unsaved_new_object.add_member comp_1[:id]
+      @comps_added_to_static_group << comp_1[:id]
+      say "Added computer id #{comp_1[:id]} to unsaved Static Group"
+
+      comp_2 = @all_comps_shuffled.shift
+      @unsaved_new_object.add_member comp_2[:name]
+      @comps_added_to_static_group << comp_2[:name]
+      say "Added computer name #{comp_2[:name]} to unsaved Static Group"
+
+      comp_3 = @all_comps_shuffled.shift
+      @unsaved_new_object.add_member comp_3[:serial_number]
+      @comps_added_to_static_group << comp_3[:serial_number]
+      say "Added computer serial_number #{comp_3[:serial_number]} to unsaved Static Group"
+
+      comp_4 = @all_comps_shuffled.shift
+      @unsaved_new_object.add_member comp_4[:udid]
+      @comps_added_to_static_group << comp_4[:udid]
+      say "Added computer udid #{comp_4[:udid]} to unsaved Static Group"
+
+      comp_5 = @all_comps_shuffled.shift
+      @unsaved_new_object.add_member comp_5[:mac_address]
+      @comps_added_to_static_group << comp_5[:mac_address]
+      say "Added computer mac_address #{comp_5[:mac_address]} to unsaved Static Group"
+    end
+
+    ################
+    def validate_fetched
+      super
+
+      unless @fetched_new_object.member_ids.sort == @unsaved_new_object.member_ids.sort
+        raise 'Original ruby object created with .create does not have the same member ids as the one re-fetched after saving!'
+      end
+
+      say "Fetched instance of #{collection_class} has the same members as the one we made with .create"
+    end
+
+    ################
+    def modify_fetched
+      super
+
+      @comps_added_to_static_group.shuffle!
+      3.times do
+        comp_to_remove = @comps_added_to_static_group.shift
+        @fetched_new_object.remove_member comp_to_remove
+        say "Removed member with identifier '#{comp_to_remove}'"
+      end      
+
+      @modified_member_ids = @fetched_new_object.member_ids
+    end
+
+    ################
+    def validate_changes
+      
+      unless @fetched_new_object.member_ids.sort == @fetched_edited_object.member_ids.sort
+        raise 'Modified ruby object saved after editing does not have the same member ids as the one originally saved!'
+      end
+
+      say "Modified/saved/refetched instance of #{collection_class} has correct membership."
+
+      # Test the class method for changing membership without instantiating/saving
+      adds = []
+      adds << @all_comps_shuffled.shift[:id]
+      adds << @all_comps_shuffled.shift[:serial_number]
+      adds << @all_comps_shuffled.shift[:udid]
+      removes = @fetched_edited_object.member_ids.sample
+
+      collection_class.change_membership @fetched_edited_object.id, add_members: adds, remove_members: removes 
+      say "Successfully used #{collection_class}.change_membership to immediately add and remove members."
+    end
+
+    ################
+    def confirm_deleted
+      say 'Pausing 15 secs for group deletion to complete...'
+      sleep 15
+      super
+    end
+
+  end # class ComputerGroup
+
+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/department.rb

@@ -0,0 +1,41 @@
+### 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 Department < JamfTest::APITest
+
+    include JamfTest::CollectionTests
+
+    COLLECTION_CLASS = Jamf::Department
+
+    # run the tests
+    def run_class_tests
+      run_collection_tests
+    end
+
+  end # class
+
+end # module JamfTest