Skip to content

Commit

Permalink
refs #44370, downgrade rspec and puppet
Browse files Browse the repository at this point in the history
  • Loading branch information
Ilya Margolin committed Oct 22, 2012
1 parent 5a8df12 commit d97398c
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 16 deletions.
3 changes: 2 additions & 1 deletion Gemfile
@@ -1,9 +1,10 @@
source :rubygems

puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['~> 2.7']

gem 'rake'
gem 'puppet-lint'
gem 'rspec-puppet'
gem 'puppet', puppetversion
gem 'puppetlabs_spec_helper'
gem 'rspec-core', '< 2.11'
27 changes: 12 additions & 15 deletions Gemfile.lock
Expand Up @@ -3,39 +3,36 @@ GEM
specs:
diff-lcs (1.1.3)
facter (1.6.13)
hiera (1.1.0)
json
json (1.7.5)
metaclass (0.0.1)
mocha (0.12.7)
metaclass (~> 0.0.1)
puppet (3.0.0)
facter (>= 1.6.11)
hiera (>= 1.0.0rc)
puppet-lint (0.3.1)
puppet (2.7.19)
facter (~> 1.5)
puppet-lint (0.3.2)
puppetlabs_spec_helper (0.3.0)
mocha (>= 0.10.5)
rake
rspec (>= 2.9.0)
rspec-puppet (>= 0.1.1)
rake (0.9.2.2)
rspec (2.11.0)
rspec-core (~> 2.11.0)
rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.11.0)
rspec-core (2.11.1)
rspec-expectations (2.11.3)
rspec (2.10.0)
rspec-core (~> 2.10.0)
rspec-expectations (~> 2.10.0)
rspec-mocks (~> 2.10.0)
rspec-core (2.10.1)
rspec-expectations (2.10.0)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.3)
rspec-mocks (2.10.1)
rspec-puppet (0.1.5)
rspec

PLATFORMS
ruby

DEPENDENCIES
puppet (>= 2.7)
puppet (~> 2.7)
puppet-lint
puppetlabs_spec_helper
rake
rspec-core (< 2.11)
rspec-puppet
2 changes: 2 additions & 0 deletions spec/classes/newrelic_spec.rb
@@ -1,3 +1,5 @@
require 'spec_helper'

describe "newrelic" do

some_license_key = '0c3b79d7387aaaa2103ab38ae41577fc45141741'
Expand Down
2 changes: 2 additions & 0 deletions spec/classes/php5_spec.rb
@@ -1,3 +1,5 @@
require 'spec_helper'

describe 'newrelic::php5' do

some_app_name = 'some_appname'
Expand Down

0 comments on commit d97398c

Please sign in to comment.