From 747e0fd4c2626382083b92053830a46db05a715e Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 23 Jan 2023 10:58:31 +0100 Subject: [PATCH] Fix tests --- test/cli/accessory_test.rb | 2 +- test/configuration/accessory_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cli/accessory_test.rb b/test/cli/accessory_test.rb index a0b13c5b..5ecd473b 100644 --- a/test/cli/accessory_test.rb +++ b/test/cli/accessory_test.rb @@ -17,6 +17,6 @@ class CliAccessoryTest < ActiveSupport::TestCase test "boot" do command = stdouted { Mrsk::Cli::Accessory.start(["boot", "mysql", "-c", "test/fixtures/deploy_with_accessories.yml"]) } - assert_match "Running docker run --name app-mysql -d --restart unless-stopped -p 3306:3306 -e [REDACTED] -e MYSQL_ROOT_HOST=% --volume /var/lib/mysql:/var/lib/mysql --volume app-mysql/etc/mysql/my.cnf:/etc/mysql/my.cnf --label service=app-mysql mysql:5.7 on 1.1.1.3", command + assert_match "Running docker run --name app-mysql -d --restart unless-stopped -p 3306:3306 -e [REDACTED] -e MYSQL_ROOT_HOST=% --volume /var/lib/mysql:/var/lib/mysql --volume $PWD/app-mysql/etc/mysql/my.cnf:/etc/mysql/my.cnf --label service=app-mysql mysql:5.7 on 1.1.1.3", command end end diff --git a/test/configuration/accessory_test.rb b/test/configuration/accessory_test.rb index d3c837db..1bc42a0a 100644 --- a/test/configuration/accessory_test.rb +++ b/test/configuration/accessory_test.rb @@ -87,7 +87,7 @@ class ConfigurationAccessoryTest < ActiveSupport::TestCase end test "volume args" do - assert_equal ["--volume", "app-mysql/etc/mysql/my.cnf:/etc/mysql/my.cnf", "--volume", "app-mysql/docker-entrypoint-initdb.d/structure.sql:/docker-entrypoint-initdb.d/structure.sql"], @config.accessory(:mysql).volume_args + assert_equal ["--volume", "$PWD/app-mysql/etc/mysql/my.cnf:/etc/mysql/my.cnf", "--volume", "$PWD/app-mysql/docker-entrypoint-initdb.d/structure.sql:/docker-entrypoint-initdb.d/structure.sql"], @config.accessory(:mysql).volume_args assert_equal ["--volume", "/var/lib/redis:/data"], @config.accessory(:redis).volume_args end end