From 7000d42b8634396b518568939bb1f6ac9e49e4d3 Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Thu, 2 Jun 2016 22:34:19 +0200 Subject: fix specs --- spec/cli_spec.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'spec/cli_spec.rb') diff --git a/spec/cli_spec.rb b/spec/cli_spec.rb index 0a6c91b..b248766 100644 --- a/spec/cli_spec.rb +++ b/spec/cli_spec.rb @@ -9,11 +9,9 @@ describe Oxidized::CLI do %w[-v --version].each do |option| describe option do - before { ARGV.replace [option] } + before { ARGV.push(option) } it 'prints the version and exits' do - Oxidized::Config.expects(:load) - Oxidized.expects(:setup_logger) Kernel.expects(:exit) proc { -- cgit v1.2.3 From 369bf7c96cfcf342c55f7a57170bd00c352154e3 Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Thu, 2 Jun 2016 23:41:42 +0200 Subject: cleaner spec --- lib/oxidized/input/.telnet.rb.swp | Bin 0 -> 16384 bytes lib/oxidized/worker.rb | 2 +- spec/cli_spec.rb | 14 +++++++------- 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 lib/oxidized/input/.telnet.rb.swp (limited to 'spec/cli_spec.rb') diff --git a/lib/oxidized/input/.telnet.rb.swp b/lib/oxidized/input/.telnet.rb.swp new file mode 100644 index 0000000..dc6503d Binary files /dev/null and b/lib/oxidized/input/.telnet.rb.swp differ diff --git a/lib/oxidized/worker.rb b/lib/oxidized/worker.rb index 7aec42a..1952d01 100644 --- a/lib/oxidized/worker.rb +++ b/lib/oxidized/worker.rb @@ -28,7 +28,7 @@ module Oxidized @jobs.push Job.new node Oxidized.logger.debug "lib/oxidized/worker.rb: Added #{node.name} to the job queue" end - Oxidized.logger.debug "lib/oxidized/worker.rb: #{@jobs.size} jobs running in parallel" + Oxidized.logger.debug("lib/oxidized/worker.rb: #{@jobs.size} jobs running in parallel") unless @jobs.empty? end def process job diff --git a/spec/cli_spec.rb b/spec/cli_spec.rb index b248766..f3e7cb4 100644 --- a/spec/cli_spec.rb +++ b/spec/cli_spec.rb @@ -2,21 +2,21 @@ require 'spec_helper' require 'oxidized/cli' describe Oxidized::CLI do - let(:asetus) { mock() } - + before do + @original = ARGV + @asetus = Asetus.new + end after { ARGV.replace @original } - before { @original = ARGV } %w[-v --version].each do |option| describe option do - before { ARGV.push(option) } + before { ARGV.replace([option]) } it 'prints the version and exits' do + Asetus.expects(:new).returns(@asetus) Kernel.expects(:exit) - proc { - Oxidized::CLI.new - }.must_output "#{Oxidized::VERSION}\n" + assert_output("#{Oxidized::VERSION}\n") { Oxidized::CLI.new } end end end -- cgit v1.2.3 From 64bdbeb673a8ab7155478ee5e0d1d58c1631a9d3 Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Thu, 2 Jun 2016 23:51:08 +0200 Subject: fix cli spec --- lib/oxidized/input/.telnet.rb.swp | Bin 16384 -> 0 bytes spec/cli_spec.rb | 9 ++++----- 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 lib/oxidized/input/.telnet.rb.swp (limited to 'spec/cli_spec.rb') diff --git a/lib/oxidized/input/.telnet.rb.swp b/lib/oxidized/input/.telnet.rb.swp deleted file mode 100644 index dc6503d..0000000 Binary files a/lib/oxidized/input/.telnet.rb.swp and /dev/null differ diff --git a/spec/cli_spec.rb b/spec/cli_spec.rb index f3e7cb4..eb9872e 100644 --- a/spec/cli_spec.rb +++ b/spec/cli_spec.rb @@ -2,10 +2,7 @@ require 'spec_helper' require 'oxidized/cli' describe Oxidized::CLI do - before do - @original = ARGV - @asetus = Asetus.new - end + before { @original = ARGV } after { ARGV.replace @original } %w[-v --version].each do |option| @@ -13,7 +10,9 @@ describe Oxidized::CLI do before { ARGV.replace([option]) } it 'prints the version and exits' do - Asetus.expects(:new).returns(@asetus) + Oxidized::Config.expects(:load) + Oxidized.expects(:setup_logger) + File.expects(:expand_path) Kernel.expects(:exit) assert_output("#{Oxidized::VERSION}\n") { Oxidized::CLI.new } -- cgit v1.2.3