Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ group :test do
gem 'rspec-its'
gem 'rspec-rails', '~> 7.1.1'
gem 'rspec-wait'
gem 'rubocop', '~> 1.71.2'
gem 'rubocop', '~> 1.72.2'
gem 'rubocop-capybara'
gem 'rubocop-factory_bot'
gem 'rubocop-rails', '~> 2.29'
Expand Down
8 changes: 5 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ GEM
addressable (~> 2.0)
excon
http (>= 2.0, < 6.0)
lint_roller (1.1.0)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand Down Expand Up @@ -468,9 +469,10 @@ GEM
activesupport (>= 3.0.0)
mustache (~> 1.0, >= 0.99.4)
rspec (~> 3.0)
rubocop (1.71.2)
rubocop (1.72.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
Expand Down Expand Up @@ -663,7 +665,7 @@ DEPENDENCIES
rspec-rails (~> 7.1.1)
rspec-wait
rspec_api_documentation (>= 6.1.0)
rubocop (~> 1.71.2)
rubocop (~> 1.72.2)
rubocop-capybara
rubocop-factory_bot
rubocop-rails (~> 2.29)
Expand Down
16 changes: 8 additions & 8 deletions spec/acceptance/service_broker_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ def build_service(attrs={})
end

context "of type #{test[:type]} and action #{schema_action} has a valid schema" do
let(:schema) { { (test[:type]).to_s => { schema_action => { 'parameters' => { '$schema': 'http://json-schema.org/draft-04/schema#', type: 'object' } } } } }
let(:schema) { { test[:type].to_s => { schema_action => { 'parameters' => { '$schema': 'http://json-schema.org/draft-04/schema#', type: 'object' } } } } }

before do
stub_catalog_fetch(200, default_catalog(plan_schemas: schema))
Expand All @@ -424,8 +424,8 @@ def build_service(attrs={})

context "of type #{test[:type]} and action #{schema_action} is not a JSON object" do
{
"#{test[:type]}.#{schema_action}": { (test[:type]).to_s => { schema_action => true } },
"#{test[:type]}.#{schema_action}.parameters": { (test[:type]).to_s => { schema_action => { 'parameters' => true } } }
"#{test[:type]}.#{schema_action}": { test[:type].to_s => { schema_action => true } },
"#{test[:type]}.#{schema_action}.parameters": { test[:type].to_s => { schema_action => { 'parameters' => true } } }
}.each do |path, schema|
context "operator receives an error about #{path} #{schema}" do
before do
Expand Down Expand Up @@ -456,7 +456,7 @@ def build_service(attrs={})

context "of type #{test[:type]} and action #{schema_action} does not conform to JSON Schema Draft 04 (experimental support for later versions)" do
let(:path) { "#{test[:type]}.#{schema_action}.parameters" }
let(:schema) { { (test[:type]).to_s => { schema_action => { 'parameters' => { '$schema': 'http://json-schema.org/draft-04/schema#', properties: true } } } } }
let(:schema) { { test[:type].to_s => { schema_action => { 'parameters' => { '$schema': 'http://json-schema.org/draft-04/schema#', properties: true } } } } }

before do
stub_catalog_fetch(200, default_catalog(plan_schemas: schema))
Expand Down Expand Up @@ -487,7 +487,7 @@ def build_service(attrs={})
let(:path) { "#{test[:type]}.#{schema_action}.parameters" }
let(:schema) do
{
(test[:type]).to_s => {
test[:type].to_s => {
schema_action => {
'parameters' => {
'$schema': 'http://json-schema.org/draft-04/schema#',
Expand Down Expand Up @@ -528,7 +528,7 @@ def build_service(attrs={})

context "of type #{test[:type]} and action #{schema_action} has an external schema" do
let(:path) { "#{test[:type]}.#{schema_action}.parameters" }
let(:schema) { { (test[:type]).to_s => { schema_action => { 'parameters' => { '$schema': 'http://example.com/schema', type: 'object' } } } } }
let(:schema) { { test[:type].to_s => { schema_action => { 'parameters' => { '$schema': 'http://example.com/schema', type: 'object' } } } } }

before do
stub_catalog_fetch(200, default_catalog(plan_schemas: schema))
Expand Down Expand Up @@ -558,7 +558,7 @@ def build_service(attrs={})
let(:path) { "#{test[:type]}.#{schema_action}.parameters" }
let(:schema) do
{
(test[:type]).to_s => {
test[:type].to_s => {
schema_action => {
'parameters' => {
'$schema': 'http://json-schema.org/draft-04/schema#',
Expand Down Expand Up @@ -595,7 +595,7 @@ def build_service(attrs={})

context "of type #{test[:type]} and action #{schema_action} has no $schema" do
let(:path) { "#{test[:type]}.#{schema_action}.parameters" }
let(:schema) { { (test[:type]).to_s => { schema_action => { 'parameters' => { type: 'object' } } } } }
let(:schema) { { test[:type].to_s => { schema_action => { 'parameters' => { type: 'object' } } } } }

before do
stub_catalog_fetch(200, default_catalog(plan_schemas: schema))
Expand Down