Raise custom exception instead of SystemExit
This commit is contained in:
parent
5083717a15
commit
18fc8bc138
@ -19,6 +19,8 @@ module Jekyll
|
|||||||
require 'jekyll/algolia/utils'
|
require 'jekyll/algolia/utils'
|
||||||
require 'jekyll/algolia/version'
|
require 'jekyll/algolia/version'
|
||||||
|
|
||||||
|
MissingCredentialsError = Class.new(StandardError)
|
||||||
|
|
||||||
# Public: Init the Algolia module
|
# Public: Init the Algolia module
|
||||||
#
|
#
|
||||||
# config - A hash of Jekyll config option (merge of _config.yml options and
|
# config - A hash of Jekyll config option (merge of _config.yml options and
|
||||||
@ -33,7 +35,12 @@ module Jekyll
|
|||||||
config = Configurator.init(config).config
|
config = Configurator.init(config).config
|
||||||
@site = Jekyll::Algolia::Site.new(config)
|
@site = Jekyll::Algolia::Site.new(config)
|
||||||
|
|
||||||
exit 1 unless Configurator.assert_valid_credentials
|
unless Configurator.assert_valid_credentials
|
||||||
|
raise(
|
||||||
|
MissingCredentialsError,
|
||||||
|
"One or more credentials were not found for site at: #{@site.source}"
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
Configurator.warn_of_deprecated_options
|
Configurator.warn_of_deprecated_options
|
||||||
|
|
||||||
|
|||||||
@ -57,7 +57,7 @@ describe(Jekyll::Algolia) do
|
|||||||
.and_return(false)
|
.and_return(false)
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to raise_error SystemExit }
|
it { is_expected.to raise_error Jekyll::Algolia::MissingCredentialsError }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -14,7 +14,7 @@ require 'ostruct'
|
|||||||
|
|
||||||
RSpec.configure do |config|
|
RSpec.configure do |config|
|
||||||
config.filter_run(focus: true)
|
config.filter_run(focus: true)
|
||||||
config.fail_fast = true
|
config.fail_fast = false
|
||||||
config.run_all_when_everything_filtered = true
|
config.run_all_when_everything_filtered = true
|
||||||
config.before do
|
config.before do
|
||||||
Jekyll::Algolia::Configurator.init
|
Jekyll::Algolia::Configurator.init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user