Skip to content

Commit d92180d

Browse files
authored
Unskip env var tests on Heroku-22 (#1668)
Since Heroku-22 has now been migrated to the new build infrastructure, so no longer has the small system env var differences that were causing these tests to fail on that stack (which is why they had been skipped as part of #1634).
1 parent bf2ce13 commit d92180d

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

spec/hatchet/hooks_spec.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
require_relative '../spec_helper'
44

55
RSpec.describe 'Compile hooks' do
6-
# TODO: Run this on Heroku-22 too, once it has also migrated to the new build infrastructure.
7-
# (Currently the test fails on the old infrastructure due to subtle differences in system PATH elements.)
8-
context 'when an app has bin/pre_compile and bin/post_compile scripts', stacks: %w[heroku-20 heroku-24] do
6+
context 'when an app has bin/pre_compile and bin/post_compile scripts' do
97
let(:app) { Hatchet::Runner.new('spec/fixtures/hooks', config: { 'SOME_APP_CONFIG_VAR' => '1' }) }
108

119
it 'runs the hooks with the correct environment' do

spec/hatchet/pip_spec.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
end
1313

1414
RSpec.describe 'pip support' do
15-
# TODO: Run this on Heroku-22 too, once it has also migrated to the new build infrastructure.
16-
# (Currently the test fails on the old infrastructure due to subtle differences in system PATH elements.)
17-
context 'when requirements.txt is unchanged since the last build', stacks: %w[heroku-20 heroku-24] do
15+
context 'when requirements.txt is unchanged since the last build' do
1816
let(:buildpacks) { [:default, 'heroku-community/inline'] }
1917
let(:app) { Hatchet::Runner.new('spec/fixtures/requirements_basic', buildpacks:) }
2018

spec/hatchet/pipenv_spec.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
let(:buildpacks) { [:default, 'heroku-community/inline'] }
88
let(:app) { Hatchet::Runner.new('spec/fixtures/pipenv_basic', buildpacks:) }
99

10-
# TODO: Run this on Heroku-22 too, once it has also migrated to the new build infrastructure.
11-
# (Currently the test fails on the old infrastructure due to subtle differences in system PATH elements.)
12-
it 'builds with the specified python_version and re-uses packages from the cache',
13-
stacks: %w[heroku-20 heroku-24] do
10+
it 'builds with the specified python_version and re-uses packages from the cache' do
1411
app.deploy do |app|
1512
# TODO: We should not be leaking the Pipenv installation into the app environment.
1613
expect(clean_output(app.output)).to match(Regexp.new(<<~REGEX))

0 commit comments

Comments
 (0)