Commit 71875d5f authored by Andrew Roetker's avatar Andrew Roetker

Revert "(PDB-1412) Update rspec dependency from 2.x to 3.x"

parent 3f46e1d6
......@@ -26,8 +26,9 @@ else
end
group :test do
gem 'rspec', '~> 3.1'
gem 'puppetlabs_spec_helper', :require => false
# Pinning to work-around an incompatiblity with 2.14 in puppetlabs_spec_helper
gem 'rspec', '2.13.0'
gem 'puppetlabs_spec_helper', '0.4.1', :require => false
case puppet_branch
when "latest"
......
......@@ -35,8 +35,4 @@ RSpec.configure do |config|
end
config.expect_with :rspec do |c|
c.syntax = [:should, :expect]
end
end
......@@ -84,7 +84,7 @@ describe Puppet::Resource::Catalog::Puppetdb do
it "should add nil transaction uuid if none was given" do
result = subject.add_transaction_uuid(catalog_data_hash, nil)
result.has_key?('transaction-uuid').should be_truthy
result.has_key?('transaction-uuid').should be_true
result['transaction-uuid'].should be_nil
end
end
......
......@@ -96,7 +96,7 @@ describe processor do
result = subject.send(:report_to_hash)
# the server will populate the report id, so we validate that the
# client doesn't include one
result.has_key?("report").should be_falsey
result.has_key?("report").should be_false
result["certname"].should == subject.host
result["puppet-version"].should == subject.puppet_version
result["report-format"].should == subject.report_format
......
......@@ -2,6 +2,12 @@ require 'spec_helper'
require 'puppet/util/puppetdb/config'
require 'puppet/util/puppetdb/command_names'
# Create a local copy of these constants so that we don't have to refer to them
# by their full namespaced name
CommandReplaceCatalog = Puppet::Util::Puppetdb::CommandNames::CommandReplaceCatalog
CommandReplaceFacts = Puppet::Util::Puppetdb::CommandNames::CommandReplaceFacts
CommandStoreReport = Puppet::Util::Puppetdb::CommandNames::CommandStoreReport
describe Puppet::Util::Puppetdb::Config do
describe "#load" do
let(:confdir) do
......@@ -63,7 +69,7 @@ CONF
config.server.should == 'main_server'
config.port.should == 1234
config.ignore_blacklisted_events?.should == false
config.soft_write_failure.should be_truthy
config.soft_write_failure.should be_true
config.url_prefix.should == "/puppetdb"
end
......@@ -74,7 +80,7 @@ CONF
config.server.should == 'puppetdb'
config.port.should == 8081
config.ignore_blacklisted_events?.should == true
config.soft_write_failure.should be_falsey
config.soft_write_failure.should be_false
config.url_prefix.should == ""
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment