Skip to content

Commit eaa1381

Browse files
committed
Add validate_scopes_for_secure_parameter in Package#validate
1 parent 6e848a1 commit eaa1381

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

lib/zendesk_apps_support/package.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ def validate(options = {})
3636
skip_marketplace_translations = options.fetch(:skip_marketplace_translations, false)
3737
error_on_password_parameter = options.fetch(:error_on_password_parameter, false)
3838
validate_custom_objects_v2 = options.fetch(:validate_custom_objects_v2, false)
39+
validate_scopes_for_secure_parameter = options.fetch(:validate_scopes_for_secure_parameter, false)
3940

4041
errors = []
41-
errors << Validations::Manifest.call(self, error_on_password_parameter: error_on_password_parameter)
42+
errors << Validations::Manifest.call(self, error_on_password_parameter: error_on_password_parameter, validate_scopes_for_secure_parameter: validate_scopes_for_secure_parameter)
4243

4344
if has_valid_manifest?(errors)
4445
errors << Validations::Marketplace.call(self) if marketplace

spec/package_spec.rb

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -455,18 +455,6 @@ def build_app_source_with_files(files)
455455
end
456456
end
457457

458-
context 'when error_on_password_parameter is true' do
459-
let(:package) { ZendeskAppsSupport::Package.new('spec/fixtures/iframe_only_app') }
460-
461-
before do
462-
allow(ZendeskAppsSupport::Validations::Manifest).to receive(:call)
463-
package.validate!(marketplace: true, error_on_password_parameter: true)
464-
end
465-
it 'validate manifest and passes in the error_on_password_parameter correctly' do
466-
expect(ZendeskAppsSupport::Validations::Manifest).to have_received(:call).with(package, {:error_on_password_parameter => true})
467-
end
468-
end
469-
470458
context 'when validate_custom_objects_v2 is true' do
471459
let(:package) { ZendeskAppsSupport::Package.new('spec/fixtures/iframe_only_app') }
472460

@@ -481,18 +469,25 @@ def build_app_source_with_files(files)
481469
end
482470

483471
context 'when handling validation options' do
472+
let(:package) { ZendeskAppsSupport::Package.new('spec/fixtures/iframe_only_app') }
473+
484474
before do
485475
allow(ZendeskAppsSupport::Validations::Manifest).to receive(:call).and_return([])
486476
allow(ZendeskAppsSupport::Validations::Translations).to receive(:call)
487477
allow(ZendeskAppsSupport::Validations::Requirements).to receive(:call)
488478
end
489479

480+
it 'passes manifest validation options correctly' do
481+
package.validate!(marketplace: true, error_on_password_parameter: true, validate_scopes_for_secure_parameter: true)
482+
expect(ZendeskAppsSupport::Validations::Manifest).to have_received(:call).with(package, {:error_on_password_parameter => true, :validate_scopes_for_secure_parameter => true})
483+
end
484+
490485
it 'uses default values when called with empty options' do
491486
package.validate!
492487

493488
expect(ZendeskAppsSupport::Validations::Manifest).to have_received(:call).with(
494489
package,
495-
{ error_on_password_parameter: false }
490+
{ error_on_password_parameter: false, validate_scopes_for_secure_parameter: false }
496491
)
497492
expect(ZendeskAppsSupport::Validations::Marketplace).to have_received(:call).with(package)
498493
expect(ZendeskAppsSupport::Validations::Translations).to have_received(:call).with(

0 commit comments

Comments
 (0)