Skip to content

(MODULES-3240) Fix rspec-puppet incompatibility #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion spec/functions/functions_shared_examples.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
require 'rspec'

RSpec.shared_context 'scope' do
let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
end

RSpec.shared_examples 'compile' do
Expand Down
1 change: 0 additions & 1 deletion spec/functions/sqlserver_is_domain_user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

RSpec.describe 'sqlserver_is_domain_or_local_user?' do
shared_examples 'return the value' do
let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
it {
Facter.stubs(:value).with(anything())
Facter.stubs(:value).with(:hostname).returns('mybox')
Expand Down
2 changes: 0 additions & 2 deletions spec/functions/sqlserver_upcase_spec.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
require 'spec_helper'

describe "the sqlserver_upcase function" do
let(:scope) { PuppetlabsSpec::PuppetInternals.scope }

it "should exist" do
expect(Puppet::Parser::Functions.function("sqlserver_upcase")).to eq("function_sqlserver_upcase")
end
Expand Down
2 changes: 0 additions & 2 deletions spec/functions/sqlserver_validate_hash_uniq_values_spec.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
require 'spec_helper'

describe "the sqlserver_validate_hash_uniq_values" do
let(:scope) { PuppetlabsSpec::PuppetInternals.scope }

it "should exist" do
expect(Puppet::Parser::Functions.function("sqlserver_validate_hash_uniq_values")).to eq("function_sqlserver_validate_hash_uniq_values")
end
Expand Down
2 changes: 0 additions & 2 deletions spec/functions/sqlserver_validate_instance_name_spec.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
require 'spec_helper'

describe 'sqlserver_validate_instance_name function' do
let(:scope) { PuppetlabsSpec::PuppetInternals.scope }

it 'should exist' do
expect(Puppet::Parser::Functions.function("sqlserver_validate_instance_name")).to eq("function_sqlserver_validate_instance_name")
end
Expand Down
2 changes: 0 additions & 2 deletions spec/functions/sqlserver_validate_size_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
require 'puppet/error'

describe 'sqlserver_validate_size function' do
let(:scope) { PuppetlabsSpec::PuppetInternals.scope }

shared_examples 'should compile' do |value|
it "with a value #{value}" do
scope.function_sqlserver_validate_size([value])
Expand Down
2 changes: 0 additions & 2 deletions spec/functions/sqlserver_validate_svrroles_hash_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
require 'puppet/error'

RSpec.describe 'sqlserver_validate_svrroles_hash function' do
let(:scope) { PuppetlabsSpec::PuppetInternals.scope }

possible_roles = %w(sysadmin serveradmin securityadmin processadmin setupadmin bulkadmin diskadmin dbcreator)

shared_examples 'compile' do |value|
Expand Down