Merge remote-tracking branch 'origin/develop'

Author: snipe

tests/Support/AssertHasActionLogs.php

@@ -11,7 +11,8 @@ trait AssertHasActionLogs
 {
     public function assertHasTheseActionLogs(Model $item, array $statuses)
     {
-        Assert::assertEquals($statuses, $item->assetlog()->orderBy('id')->pluck('action_type')->toArray(), "Failed asserting that action logs match");
+        //note we have to do a 'reorder()' here because there is an implicit "order_by created_at" baked in to the relationship
+        Assert::assertEquals($statuses, $item->assetlog()->reorder('id')->pluck('action_type')->toArray(), "Failed asserting that action logs match");
     }
 
 }

tests/Unit/LdapTest.php

@@ -228,6 +228,7 @@ public function testFreshTLSFile()
         $this->settings->enableLdap()->set(['ldap_client_tls_cert' => 'SAMPLE CERT TEXT']);
         $client_side_cert_path = Setting::get_client_side_cert_path();
         file_put_contents($client_side_cert_path, 'WEIRDLY UPDATED CERT FILE');
+        clearstatcache();
         //the system should respect our cache-file, since the settings haven't been updated
         $possibly_recached_cert_file = Setting::get_client_side_cert_path(); //this should *NOT* re-cache from the Settings
         $this->assertStringEqualsFile($possibly_recached_cert_file, 'WEIRDLY UPDATED CERT FILE');