feat: make heroku-22/jammy the default stack for cnb/herokuish builds

tests/apps/dockerfile/app.json

@@ -25,7 +25,7 @@
       "generator": "echo 5"
     }
   },
-  "image": "gliderlabs/herokuish:latest-20",
+  "image": "gliderlabs/herokuish:latest-22",
   "addons": [
     "dokku-postgres",
     "dokku-redis"

tests/apps/multi/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby '2.7.5'
+ruby '3.1.4'
 
 gem 'compass', ">= 1.0.1"
 gem 'sass-globbing'

tests/apps/multi/Gemfile.lock

@@ -16,7 +16,7 @@ GEM
       sass (>= 3.2, < 3.5)
     ffi (1.15.5)
     multi_json (1.15.0)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     sass (3.4.25)
@@ -31,7 +31,7 @@ DEPENDENCIES
   sass-globbing
 
 RUBY VERSION
-   ruby 2.7.5p203
+   ruby 3.1.4p223
 
 BUNDLED WITH
-   2.1.4
+   2.3.26

tests/apps/nodejs-express/app.json

@@ -25,7 +25,7 @@
       "generator": "echo 5"
     }
   },
-  "image": "gliderlabs/herokuish:latest-20",
+  "image": "gliderlabs/herokuish:latest-22",
   "addons": [
     "dokku-postgres",
     "dokku-redis"

tests/apps/python/cnb/1/buildpack.toml

@@ -6,4 +6,4 @@ version = "0.1.0"
 name = "1 Packages Buildpack"
 
 [[stacks]]
-id = "heroku-20"
+id = "heroku-22"

tests/apps/python/cnb/2/buildpack.toml

@@ -6,4 +6,4 @@ version = "0.1.0"
 name = "2 Packages Buildpack"
 
 [[stacks]]
-id = "heroku-20"
+id = "heroku-22"

tests/unit/builder-pack.bats

@@ -25,7 +25,7 @@ teardown() {
   echo "status: $status"
   assert_success
 
-  run /bin/bash -c "dokku buildpacks:set-property $TEST_APP stack heroku/buildpacks:20"
+  run /bin/bash -c "dokku buildpacks:set-property $TEST_APP stack heroku/builder:22"
   echo "output: $output"
   echo "status: $status"
   assert_success
@@ -35,8 +35,7 @@ teardown() {
   echo "status: $status"
   assert_success
   assert_output_contains 'Building with buildpack 1' 0
-  assert_output_contains 'Installing requirements with pip'
-  assert_output_contains "Build time env var SECRET_KEY=fjdkslafjdk"
+  assert_output_contains 'Installing dependencies using Pip'
 
   run /bin/bash -c "dokku builder-pack:set $TEST_APP projecttoml-path nonexistent.toml"
   echo "output: $output"
@@ -48,7 +47,7 @@ teardown() {
   echo "status: $status"
   assert_success
   assert_output_contains 'Building with buildpack 1' 0
-  assert_output_contains 'Installing requirements with pip'
+  assert_output_contains 'Installing dependencies using Pip'
 
   run /bin/bash -c "dokku builder-pack:set $TEST_APP projecttoml-path project2.toml"
   echo "output: $output"
@@ -60,7 +59,7 @@ teardown() {
   echo "status: $status"
   assert_success
   assert_output_contains 'Building with buildpack 1'
-  assert_output_contains 'Installing requirements with pip' 0
+  assert_output_contains 'Installing dependencies using Pip' 0
 
   run /bin/bash -c "dokku builder-pack:set $TEST_APP projecttoml-path"
   echo "output: $output"
@@ -72,7 +71,7 @@ teardown() {
   echo "status: $status"
   assert_success
   assert_output_contains 'Building with buildpack 1' 0
-  assert_output_contains 'Installing requirements with pip'
+  assert_output_contains 'Installing dependencies using Pip'
 }
 
 @test "(builder-pack) git:from-image without a Procfile" {