Merge branch 'basecamp:main' into buildpacks

2024-09-16 18:11:33 -07:00
parent 2c5f2a7ce0 66d5e25834
commit 548452aa12
85 changed files with 1539 additions and 746 deletions
--- a/test/configuration/builder_test.rb
+++ b/test/configuration/builder_test.rb
@@ -110,13 +110,15 @@ class ConfigurationBuilderTest < ActiveSupport::TestCase
  end

  test "secrets" do
-    assert_equal [], config.builder.secrets
+    assert_equal({}, config.builder.secrets)
  end

  test "setting secrets" do
-    @deploy[:builder]["secrets"] = [ "GITHUB_TOKEN" ]
+    with_test_secrets("secrets" => "GITHUB_TOKEN=secret123") do
+      @deploy[:builder]["secrets"] = [ "GITHUB_TOKEN" ]

-    assert_equal [ "GITHUB_TOKEN" ], config.builder.secrets
+      assert_equal({ "GITHUB_TOKEN" => "secret123" }, config.builder.secrets)
+    end
  end

  test "dockerfile" do