PB-37351: fixed mounts in tests

passbolt · Dec 30, 2024 · 5a638a7 · 5a638a7
1 parent 6ad8042
commit 5a638a7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/spec/docker_runtime_no_envs/runtime_no_envs_spec.rb b/spec/docker_runtime_no_envs/runtime_no_envs_spec.rb
@@ -41,11 +41,14 @@
       'Env' => [
         "DATASOURCES_DEFAULT_HOST=#{@mysql.json['NetworkSettings']['IPAddress']}"
       ],
-      'Binds' => $binds.append(
-        "#{FIXTURES_PATH + '/passbolt.php'}:#{PASSBOLT_CONFIG_PATH + '/passbolt.php'}",
-        "#{FIXTURES_PATH + '/public-test.key'}:#{PASSBOLT_CONFIG_PATH + 'gpg/unsecure.key'}",
-        "#{FIXTURES_PATH + '/private-test.key'}:#{PASSBOLT_CONFIG_PATH + 'gpg/unsecure_private.key'}"
-      ),
+      'HostConfig' => {
+        'Binds' => $binds.append(
+          "#{FIXTURES_PATH + '/passbolt.php'}:#{PASSBOLT_CONFIG_PATH + '/passbolt.php'}",
+          "#{FIXTURES_PATH + '/public-test.key'}:#{PASSBOLT_CONFIG_PATH + 'gpg/unsecure.key'}",
+          "#{FIXTURES_PATH + '/private-test.key'}:#{PASSBOLT_CONFIG_PATH + 'gpg/unsecure_private.key'}"
+        )
+      },
+
       'Image' => @image.id
     )
 
@@ -61,9 +64,7 @@
     @container.kill
   end
 
-  let(:passbolt_host)     { @container.json['NetworkSettings']['IPAddress'] }
-  let(:uri)               { '/install' }
-  let(:curl)              { "curl -skL -H 'Host: passbolt.local' https://#{passbolt_host}:#{$https_port}/#{uri}" }
+  let(:passbolt_host) { @container.json['NetworkSettings']['IPAddress'] }
 
   describe 'php service' do
     it 'is running supervised' do
@@ -91,9 +92,11 @@
     end
   end
 
-  describe 'passbolt install' do
+  describe 'passbolt healthcheck' do
+    let(:uri)               { '/healthcheck/status.json' }
+    let(:curl)              { "curl -sk -o /dev/null -w '%{http_code}' -H 'Host: passbolt.local' https://#{passbolt_host}:#{$https_port}/#{uri}" }
     it 'shows correctly' do
-      expect(command(curl).stdout).to match(/.*Passbolt is not configured yet!.*/)
+      expect(command(curl).stdout).to eq '200'
     end
   end
 

diff --git a/spec/docker_runtime_with_passbolt_php/docker_runtime_with_passbolt_php_spec.rb b/spec/docker_runtime_with_passbolt_php/docker_runtime_with_passbolt_php_spec.rb
@@ -58,11 +58,13 @@
         'PASSBOLT_HEALTHCHECK_ERROR=true'
       ],
       'Image' => @image.id,
-      'Binds' => $binds.append(
+      'HostConfig' => {
+        'Binds' => $binds.append(
         "#{FIXTURES_PATH + '/passbolt-no-fingerprint.php'}:#{PASSBOLT_CONFIG_PATH + '/passbolt.php'}",
         "#{FIXTURES_PATH + '/public-test.key'}:#{PASSBOLT_CONFIG_PATH + 'gpg/unsecure.key'}",
         "#{FIXTURES_PATH + '/private-test.key'}:#{PASSBOLT_CONFIG_PATH + 'gpg/unsecure_private.key'}"
-      )
+        )
+      },
     )
 
     @container.start