Commit graph

13 commits

Author SHA1 Message Date
Travis Fields
7bc211ceba MODULES-1764 Fix missing method for check_is_owned_by for windows
Fix tests to use its(:content) instead of deprecated should contain
2015-02-10 16:38:47 -08:00
Morgan Haskel
f81ef495e3 Fixing up tests 2014-09-10 19:11:28 -04:00
Morgan Haskel
5f17a26256 Merge branch '1.0.x' into test_merge
Conflicts:
	CHANGELOG.md
	Gemfile
	Modulefile
	README.markdown
	Rakefile
	files/concatfragments.sh
	manifests/setup.pp
	metadata.json
	spec/acceptance/backup_spec.rb
	spec/acceptance/concat_spec.rb
	spec/acceptance/empty_spec.rb
	spec/acceptance/fragment_source_spec.rb
	spec/acceptance/newline_spec.rb
	spec/acceptance/nodesets/centos-64-x64.yml
	spec/acceptance/nodesets/default.yml
	spec/acceptance/nodesets/fedora-18-x64.yml
	spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
	spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
	spec/acceptance/order_spec.rb
	spec/acceptance/replace_spec.rb
	spec/acceptance/symbolic_name_spec.rb
	spec/acceptance/warn_spec.rb
	spec/spec_helper_acceptance.rb
2014-09-10 15:03:35 -04:00
Morgan Haskel
0acefbb79d Stop checking for empty stderr 2014-09-08 15:01:30 -04:00
Ashley Penney
f66ca3c1b7 Remove all the eq() checks as this breaks in PE3.3. 2014-06-02 16:10:29 -04:00
Hunter Haugen
1577ec78e1 Add windows as unsupported 2014-02-28 08:39:09 -08:00
Hunter Haugen
d887c3b5f5 Lets can't be used outside of a test context 2014-02-27 15:50:18 -08:00
Hunter Haugen
f0b6187f76 Use tmpdir instead of /tmp for windows compatability 2014-02-27 14:52:53 -08:00
Hunter Haugen
311adee522 It is actually all Solaris 2014-02-27 14:20:42 -08:00
Hunter Haugen
f37805060f Correct syntax 2014-02-27 13:18:29 -08:00
Hunter Haugen
1f61e9d122 Avoid multi-line greps on solaris 10 2014-02-27 13:01:13 -08:00
Ashley Penney
596cec14be Port over acceptance tests from master. 2014-02-12 17:47:43 -05:00
Hunter Haugen
20e8d6e4f6 Convert specs to beaker and increase coverage 2014-01-16 16:49:30 -08:00