diff --git a/spec/unit/util/colors_spec.rb b/spec/unit/util/colors_spec.rb index fb02e9cde..b0f791f82 100755 --- a/spec/unit/util/colors_spec.rb +++ b/spec/unit/util/colors_spec.rb @@ -1,97 +1,89 @@ #!/usr/bin/env ruby require 'spec_helper' describe Puppet::Util::Colors do include Puppet::Util::Colors let (:message) { 'a message' } let (:color) { :black } let (:subject) { self } describe ".console_color" do it { should respond_to :console_color } it "should generate ANSI escape sequences" do subject.console_color(color, message).should == "\e[0;30m#{message}\e[0m" end end describe ".html_color" do it { should respond_to :html_color } it "should generate an HTML span element and style attribute" do subject.html_color(color, message).should =~ /#{message}<\/span>/ end end describe ".colorize" do it { should respond_to :colorize } context "ansicolor supported" do before :each do subject.stubs(:console_has_color?).returns(true) end it "should colorize console output" do Puppet[:color] = true subject.expects(:console_color).with(color, message) subject.colorize(:black, message) end it "should not colorize unknown color schemes" do Puppet[:color] = :thisisanunknownscheme subject.colorize(:black, message).should == message end end context "ansicolor not supported" do before :each do subject.stubs(:console_has_color?).returns(false) end it "should not colorize console output" do Puppet[:color] = true subject.expects(:console_color).never subject.colorize(:black, message).should == message end it "should colorize html output" do Puppet[:color] = :html subject.expects(:html_color).with(color, message) subject.colorize(color, message) end end end context "on Windows in Ruby 1.x", :if => Puppet.features.microsoft_windows? && RUBY_VERSION =~ /^1./ do - it "should load win32console" do - Gem.loaded_specs["win32console"].must_not be_nil + it "should define WideConsole" do + expect(defined?(Puppet::Util::Colors::WideConsole)).to be_true end - it "should wrap $stdout with Puppet::Util::Colors::WideIO" do - $stdout.must be_an_instance_of Puppet::Util::Colors::WideIO - end - - it "should wrap $stderr with Puppet::Util::Colors::WideIO" do - $stderr.must be_an_instance_of Puppet::Util::Colors::WideIO + it "should define WideIO" do + expect(defined?(Puppet::Util::Colors::WideIO)).to be_true end end context "on Windows in Ruby 2.x", :if => Puppet.features.microsoft_windows? && RUBY_VERSION =~ /^2./ do - it "should not have attempted to extend IO with Puppet::Util::Colors::WideIO" do - defined?(Puppet::Util::Colors::WideIO).must be_false - end - - it "should not attempt to wrap $stdout" do - $stdout.must be_an_instance_of IO + it "should not define WideConsole" do + expect(defined?(Puppet::Util::Colors::WideConsole)).to be_false end - it "should not attempt to wrap $stderr" do - $stderr.must be_an_instance_of IO + it "should not define WideIO" do + expect(defined?(Puppet::Util::Colors::WideIO)).to be_false end end end