Skip to content

Commit

Permalink
Merge branch 'master' into add/missing_log
Browse files Browse the repository at this point in the history
  • Loading branch information
lagoan committed Aug 16, 2023
2 parents 8d485f3 + 972569f commit 177e6cc
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 15 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ group :development, :test do
gem 'pry-byebug', '~> 3.6'
gem 'rake', '~> 13.0'
gem 'rspec', '~> 3.0'
gem 'rubocop', '~> 1.54'
gem 'rubocop-rspec', '~> 2.22'
gem 'timecop', '~> 0.8'
gem 'rubocop', '~> 1.56'
gem 'rubocop-rspec', '~> 2.23'
gem 'timecop', '~> 0.9'
gem 'vcr', '~> 5.0'
gem 'webmock', '~> 3.3'
end
22 changes: 12 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ GEM
bagit (0.4.5)
docopt (~> 0.5.0)
validatable (~> 1.6)
base64 (0.1.1)
builder (3.2.4)
byebug (11.1.3)
claide (1.1.0)
Expand Down Expand Up @@ -141,17 +142,17 @@ GEM
rdf-xsd (3.2.1)
rdf (~> 3.2)
rexml (~> 3.2)
redis (5.0.6)
redis (5.0.7)
redis-client (>= 0.9.0)
redis-client (0.14.1)
redis-client (0.15.0)
connection_pool
regexp_parser (2.8.1)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.5)
rexml (3.2.6)
rollbar (3.4.0)
rspec (3.12.0)
rspec-core (~> 3.12.0)
Expand All @@ -166,15 +167,16 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.0)
rubocop (1.54.2)
rubocop (1.56.0)
base64 (~> 0.1.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.3)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.0, < 2.0)
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0)
Expand All @@ -183,7 +185,7 @@ GEM
rubocop (~> 1.41)
rubocop-factory_bot (2.23.1)
rubocop (~> 1.33)
rubocop-rspec (2.22.0)
rubocop-rspec (2.23.2)
rubocop (~> 1.33)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
Expand Down Expand Up @@ -211,7 +213,7 @@ GEM
systemu (2.6.5)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
timecop (0.9.6)
timecop (0.9.8)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unf (0.1.4)
Expand Down Expand Up @@ -239,9 +241,9 @@ DEPENDENCIES
pushmi_pullyu!
rake (~> 13.0)
rspec (~> 3.0)
rubocop (~> 1.54)
rubocop-rspec (~> 2.22)
timecop (~> 0.8)
rubocop (~> 1.56)
rubocop-rspec (~> 2.23)
timecop (~> 0.9)
vcr (~> 5.0)
webmock (~> 3.3)

Expand Down
6 changes: 4 additions & 2 deletions spec/pushmi_pullyu/cli_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,10 @@
end

it 'initialize setup with config yaml if given' do
allow(cli).to receive(:parse_options).and_return(config_file: 'config/pushmi_pullyu.yml')
allow(cli).to receive(:parse_config).and_return({})
allow(cli).to receive_messages(
parse_options: { config_file: 'config/pushmi_pullyu.yml' },
parse_config: {}
)

cli.parse

Expand Down

0 comments on commit 177e6cc

Please sign in to comment.