Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Bump rswag-specs from 2.11.0 to 2.13.0 (#24654)

This commit is contained in:
Roman Blanco 2023-12-07 00:16:47 +00:00 committed by GitHub
parent a192ae4c15
commit 1a8b1fc698
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -150,9 +150,7 @@ group :test, :development do
gem "rubocop-discourse", require: false gem "rubocop-discourse", require: false
gem "parallel_tests" gem "parallel_tests"
# Depreciation warnings that we can't act on is being printed out in the test output. gem "rswag-specs"
# See https://github.com/rswag/rswag/issues/703
gem "rswag-specs", "2.11.0"
gem "annotate" gem "annotate"

8
Gemfile.lock
View File

@ -185,7 +185,7 @@ GEM
in_threads (1.6.0) in_threads (1.6.0)
jmespath (1.6.2) jmespath (1.6.2)
json (2.7.1) json (2.7.1)
json-schema (3.0.0) json-schema (4.1.1)
addressable (>= 2.8) addressable (>= 2.8)
json_schemer (2.1.1) json_schemer (2.1.1)
hana (~> 1.3) hana (~> 1.3)
@ -407,9 +407,9 @@ GEM
rspec-support (3.12.1) rspec-support (3.12.1)
rss (0.3.0) rss (0.3.0)
rexml rexml
rswag-specs (2.11.0) rswag-specs (2.13.0)
activesupport (>= 3.1, < 7.2) activesupport (>= 3.1, < 7.2)
json-schema (>= 2.2, < 4.0) json-schema (>= 2.2, < 5.0)
railties (>= 3.1, < 7.2) railties (>= 3.1, < 7.2)
rspec-core (>= 2.14) rspec-core (>= 2.14)
rtlcss (0.2.1) rtlcss (0.2.1)
@ -638,7 +638,7 @@ DEPENDENCIES
rspec-html-matchers rspec-html-matchers
rspec-rails rspec-rails
rss rss
rswag-specs (= 2.11.0) rswag-specs
rtlcss rtlcss
rubocop-discourse rubocop-discourse
ruby-prof ruby-prof

12
spec/swagger_helper.rb
View File

@ -89,15 +89,15 @@ RSpec.configure do |config|
# Specify a root folder where Swagger JSON files are generated # Specify a root folder where Swagger JSON files are generated
# NOTE: If you're using the rswag-api to serve API descriptions, you'll need # NOTE: If you're using the rswag-api to serve API descriptions, you'll need
# to ensure that it's configured to serve Swagger from the same folder # to ensure that it's configured to serve Swagger from the same folder
config.swagger_root = Rails.root.join("openapi").to_s config.openapi_root = Rails.root.join("openapi").to_s
# Define one or more Swagger documents and provide global metadata for each one # Define one or more Swagger documents and provide global metadata for each one
# When you run the 'rswag:specs:swaggerize' rake task, the complete Swagger will # When you run the 'rswag:specs:swaggerize' rake task, the complete Swagger will
# be generated at the provided relative path under swagger_root # be generated at the provided relative path under openapi_root
# By default, the operations defined in spec files are added to the first # By default, the operations defined in spec files are added to the first
# document below. You can override this behavior by adding a swagger_doc tag to the # document below. You can override this behavior by adding a openapi_spec tag to the
# the root example_group in your specs, e.g. describe '...', swagger_doc: 'v2/swagger.json' # the root example_group in your specs, e.g. describe '...', openapi_spec: 'v2/swagger.json'
config.swagger_docs = { config.openapi_specs = {
"openapi.yaml" => { "openapi.yaml" => {
openapi: "3.1.0", openapi: "3.1.0",
info: { info: {
@ -135,5 +135,5 @@ RSpec.configure do |config|
# The swagger_docs configuration option has the filename including format in # The swagger_docs configuration option has the filename including format in
# the key, this may want to be changed to avoid putting yaml in json files. # the key, this may want to be changed to avoid putting yaml in json files.
# Defaults to json. Accepts ':json' and ':yaml'. # Defaults to json. Accepts ':json' and ':yaml'.
config.swagger_format = :yaml config.openapi_format = :yaml
end end