Skip to content

Commit 9b21b63

Browse files
authored
Merge pull request #685 from ruby-oauth/feat/upgrade-kettle-dev-v1.1.24
2 parents 97d860f + 37f1e1e commit 9b21b63

File tree

8 files changed

+51
-64
lines changed

8 files changed

+51
-64
lines changed

.github/workflows/current.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ jobs:
4545
rubygems: latest
4646
bundler: latest
4747

48-
# truffleruby-24.1
49-
# (according to documentation: targets Ruby 3.3 compatibility)
50-
# (according to runtime: targets Ruby 3.2 compatibility)
48+
# truffleruby-24.1 (targets Ruby 3.3 compatibility)
5149
- ruby: "truffleruby"
5250
appraisal: "current"
5351
exec_cmd: "rake test"

.idea/oauth2.iml

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.junie/guidelines.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ This document captures project-specific knowledge to streamline setup, testing,
1212
- See .env.local.example for an example of what to put in .env.local.
1313
- See CONTRIBUTING.md for details on how to set up your local environment.
1414
- Ruby and Bundler
15-
- Runtime supports very old Rubies (>= 2.2), but development tooling targets >= 2.3 because of CI/setup-ruby and dev dependencies.
15+
- Runtime supports Ruby >= 2.2.0
16+
- Development tooling targets Ruby >= 2.3 (minimum supported by setup-ruby GHA).
1617
- Use a recent Ruby (>= 3.4 recommended) for fastest setup and to exercise modern coverage behavior.
1718
- Install dependencies via Bundler in project root:
1819
- bundle install
@@ -53,7 +54,7 @@ This document captures project-specific knowledge to streamline setup, testing,
5354
- RSpec.describe usage:
5455
- Use `describe "#<method_name>"` to contain a block of specs that test instance method behavior.
5556
- Use `describe "::<method_name>"` to contain a block of specs that test class method behavior.
56-
- Do not use `describe ".<method_name>"` because the dot is ambiguous w.r.t instance vs. class methods.
57+
- Do not use `describe ".<method_name>"` because the dot is ambiguous w.r.t instance vs. class methods.
5758
- When adding new code or modifying existing code always add tests to cover the updated behavior, including branches, and different types of expected and unexpected inputs.
5859
- Additional test utilities:
5960
- rspec-stubbed_env: Use stub_env to control ENV safely within examples.
@@ -89,14 +90,11 @@ This document captures project-specific knowledge to streamline setup, testing,
8990
- Place new specs under spec/ mirroring lib/ structure where possible. Do not require "spec_helper" at the top of spec files, as it is automatically loaded by .rspec.
9091
- If your code relies on environment variables that drive activation (see "Activation env vars" below), prefer using rspec-stubbed_env:
9192
- it does not support stubbing with blocks, but it does automatically clean up after itself.
92-
- outside the example:
93-
```ruby
93+
- the below config is included in all spec scenarios by the kettle-test gem, so no need to do it again; it is here for reference:
9494
include_context 'with stubbed env'
95-
```
9695
- in a before hook, or in an example:
97-
```ruby
9896
stub_env("FLOSS_FUNDING_MY_NS" => "Free-as-in-beer")
99-
```
97+
# example code continues
10098
- If your spec needs to assert on console output, tag it with :check_output. By default, STDOUT is silenced.
10199
- Use Timecop for deterministic time-sensitive behavior as needed (require config/timecop is already done by spec_helper).
102100

@@ -136,6 +134,7 @@ Notes
136134
- Coverage reports: NEVER review the HTML report. Use JSON (preferred), XML, LCOV, or RCOV. For this project, always run tests with K_SOUP_COV_FORMATTERS set to "json".
137135
- Do NOT modify .envrc in tasks; when running tests locally or in scripts, manually prefix each run, e.g.: K_SOUP_COV_FORMATTERS="json" bin/rspec
138136
- For all the kettle-soup-cover options, see .envrc and find the K_SOUP_COV_* env vars.
137+
- NEVER modify ENV variables in tests directly. Always use the stub_env macro from the rspec-stubbed_env gem (more details in the testing section above).
139138

140139
Important documentation rules
141140
- Do NOT edit files under docs/ manually; they are generated by `bundle exec rake yard` as part of the default rake task.

Appraisals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ appraise "ruby-2-7" do
144144
eval_gemfile "modular/logger_v1_7.gemfile"
145145
eval_gemfile "modular/multi_xml_v0_6.gemfile"
146146
eval_gemfile "modular/rack_v3.gemfile"
147-
eval_gemfile "modular/x_std_libs/r3.1/libs.gemfile"
147+
eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
148148
end
149149

150150
appraise "ruby-3-0" do

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ GEM
103103
json (2.13.2)
104104
jwt (3.1.2)
105105
base64
106-
kettle-dev (1.1.20)
106+
kettle-dev (1.1.24)
107107
kettle-soup-cover (1.0.10)
108108
simplecov (~> 0.22)
109109
simplecov-cobertura (~> 3.0)
@@ -190,7 +190,7 @@ GEM
190190
ruby_version (~> 1.0)
191191
version_gem (~> 1.1, >= 1.1.8)
192192
rspec-stubbed_env (1.0.4)
193-
rspec-support (3.13.5)
193+
rspec-support (3.13.6)
194194
rspec_junit_formatter (0.6.0)
195195
rspec-core (>= 2, < 4, != 2.12.0)
196196
rubocop (1.80.2)
@@ -336,7 +336,7 @@ DEPENDENCIES
336336
gem_bench (~> 2.0, >= 2.0.5)
337337
gitmoji-regex (~> 1.0, >= 1.0.3)
338338
irb (~> 1.15, >= 1.15.2)
339-
kettle-dev (~> 1.1, >= 1.1.20)
339+
kettle-dev (~> 1.1)
340340
kettle-soup-cover (~> 1.0, >= 1.0.10)
341341
kettle-test (~> 1.0)
342342
kramdown (~> 2.5, >= 2.5.1)

0 commit comments

Comments
 (0)