From a45d4f13070cd05c029b96c789f499133721d523 Mon Sep 17 00:00:00 2001
From: Jeff McCune <jeff@puppetlabs.com>
Date: Fri, 15 Feb 2013 11:56:16 -0800
Subject: Revert "Merge pull request #130 from jhoblitt/has_element"

This reverts commit f7a18189ec338b01b0fc89d75def832753af3868, reversing
changes made to 36a7b29630a4d4de17af79b5dd4e9491ec20b123.

I'm reverting this change because of concerns raised by Peter Meier that
it duplicates the "in" operator in the DSL.  The "in" operator is new
information that I did not posses when I made the decision to merge.
Because of this new information I'm un-merging and continuing the
discussion in the comments of
https://projects.puppetlabs.com/issues/19272

Reference: GH-130
---
 .../puppet/parser/functions/has_element_spec.rb    | 42 ----------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 spec/unit/puppet/parser/functions/has_element_spec.rb

(limited to 'spec')

diff --git a/spec/unit/puppet/parser/functions/has_element_spec.rb b/spec/unit/puppet/parser/functions/has_element_spec.rb
deleted file mode 100644
index b5270d2..0000000
--- a/spec/unit/puppet/parser/functions/has_element_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:has_element) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe 'when calling has_element from puppet' do
-    it "should not compile when no arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = '$x = has_element()'
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should not compile when 1 argument is passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = "$x = has_element('foo')"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should require the first value to be an Array" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = "$x = has_element('foo', 'bar')"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /expects the first argument to be an array/)
-    end
-  end
-
-  describe 'when calling the function has_element from a scope instance' do
-    it 'should detect existing elements' do
-      scope.function_has_element([['one'], 'one']).should be_true
-    end
-
-    it 'should detect existing elements' do
-      scope.function_has_element([['one'], 'two']).should be_false
-    end
-  end
-end
-- 
cgit v1.2.3