Skip to content

Commit f38a0a3

Browse files
committed
Fix tests.
1 parent f2764ec commit f38a0a3

File tree

6 files changed

+30
-14
lines changed

6 files changed

+30
-14
lines changed

fixtures/default/relative_gemspec_path/Gemfile.lock

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,9 @@ DEPENDENCIES
2727
hola!
2828
sinatra
2929
webrick
30+
31+
RUBY VERSION
32+
ruby 3.2.0p0
33+
34+
BUNDLED WITH
35+
2.4.1

fixtures/default/sinatra_jruby/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ DEPENDENCIES
2323
webrick
2424

2525
RUBY VERSION
26-
ruby 3.1.4p0 (jruby 9.4.3.0)
26+
ruby 3.1.4p0 (jruby 9.4.8.0)
2727

2828
BUNDLED WITH
29-
2.4.14
29+
2.6.5
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
22

3-
ruby "~>3.1.0"
3+
ruby "~>3.2.0"
44
gem "webrick"
55
gem 'sinatra'
Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
rack (1.5.2)
5-
rack-protection (1.5.2)
6-
rack
7-
sinatra (1.4.4)
8-
rack (~> 1.4)
9-
rack-protection (~> 1.4)
10-
tilt (~> 1.3, >= 1.3.4)
11-
tilt (1.4.1)
12-
webrick (1.7.0)
4+
mustermann (3.0.0)
5+
ruby2_keywords (~> 0.0.1)
6+
rack (2.2.8)
7+
rack-protection (3.1.0)
8+
rack (~> 2.2, >= 2.2.4)
9+
ruby2_keywords (0.0.5)
10+
sinatra (3.1.0)
11+
mustermann (~> 3.0)
12+
rack (~> 2.2, >= 2.2.4)
13+
rack-protection (= 3.1.0)
14+
tilt (~> 2.0)
15+
tilt (2.3.0)
16+
webrick (1.8.1)
1317

1418
PLATFORMS
1519
ruby
1620

1721
DEPENDENCIES
1822
sinatra
1923
webrick
24+
25+
RUBY VERSION
26+
ruby 3.2.0p0
27+
28+
BUNDLED WITH
29+
2.4.1

src/ruby/integration/default_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T
3737
Execute(name, filepath.Join(fixtures, "default", "specified_ruby_version"))
3838
Expect(err).NotTo(HaveOccurred())
3939

40-
Eventually(deployment).Should(Serve(ContainSubstring("ruby 3.1.6")).WithEndpoint("/ruby"))
40+
Eventually(deployment).Should(Serve(MatchRegexp(`ruby 3\.2\.\d+`)).WithEndpoint("/ruby"))
4141
})
4242
})
4343

src/ruby/integration/init_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func TestIntegration(t *testing.T) {
4444
var Expect = NewWithT(t).Expect
4545

4646
format.MaxLength = 0
47-
SetDefaultEventuallyTimeout(10 * time.Second)
47+
SetDefaultEventuallyTimeout(20 * time.Second)
4848

4949
root, err := filepath.Abs("./../../..")
5050
Expect(err).NotTo(HaveOccurred())

0 commit comments

Comments
 (0)