diff --git a/.travis.yml b/.travis.yml index 485c7bb23..29373eb7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,25 @@ language: ruby sudo: false bundler_args: --without development script: - "bundle exec rake $CHECK" notifications: email: false rvm: + - 2.2.0 - 2.1.5 - 2.0.0 - 1.9.3 env: - "CHECK=parallel:spec\\[2\\]" - "CHECK=rubocop" matrix: exclude: + - rvm: 2.2.0 + env: "CHECK=rubocop" - rvm: 2.0.0 env: "CHECK=rubocop" - rvm: 1.9.3 env: "CHECK=rubocop" diff --git a/spec/unit/reports/store_spec.rb b/spec/unit/reports/store_spec.rb index 7f94f7d1b..f56eccd19 100755 --- a/spec/unit/reports/store_spec.rb +++ b/spec/unit/reports/store_spec.rb @@ -1,60 +1,60 @@ #! /usr/bin/env ruby require 'spec_helper' require 'puppet/reports' require 'time' require 'pathname' require 'tempfile' require 'fileutils' processor = Puppet::Reports.report(:store) describe processor do describe "#process" do include PuppetSpec::Files before :each do Puppet[:reportdir] = File.join(tmpdir('reports'), 'reports') @report = YAML.load_file(File.join(PuppetSpec::FIXTURE_DIR, 'yaml/report2.6.x.yaml')).extend processor end it "should create a report directory for the client if one doesn't exist" do @report.process File.should be_directory(File.join(Puppet[:reportdir], @report.host)) end it "should write the report to the file in YAML" do - Time.stubs(:now).returns(Time.parse("2011-01-06 12:00:00 UTC")) + Time.stubs(:now).returns(Time.utc(2011,01,06,12,00,00)) @report.process File.read(File.join(Puppet[:reportdir], @report.host, "201101061200.yaml")).should == @report.to_yaml end it "rejects invalid hostnames" do @report.host = ".." Puppet::FileSystem.expects(:exist?).never expect { @report.process }.to raise_error(ArgumentError, /Invalid node/) end end describe "::destroy" do it "rejects invalid hostnames" do Puppet::FileSystem.expects(:unlink).never expect { processor.destroy("..") }.to raise_error(ArgumentError, /Invalid node/) end end describe "::validate_host" do ['..', 'hello/', '/hello', 'he/llo', 'hello/..', '.'].each do |node| it "rejects #{node.inspect}" do expect { processor.validate_host(node) }.to raise_error(ArgumentError, /Invalid node/) end end ['.hello', 'hello.', '..hi', 'hi..'].each do |node| it "accepts #{node.inspect}" do processor.validate_host(node) end end end end