Skip to content

Commit

Permalink
Merge pull request #1012 from mhaskel/future_parser_fix
Browse files Browse the repository at this point in the history 
Concat started using a new fact
  • Loading branch information
@cmurphy
cmurphy committed Feb 11, 2015
2 parents fb60b61 + e11d499 commit 0c032c7
Show file tree
Hide file tree
Showing 44 changed files with 132 additions and 3 deletions.
5 changes: 5 additions & 0 deletions spec/classes/apache_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
:operatingsystemrelease => '6',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:concat_basedir => '/dne',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand Down Expand Up @@ -221,6 +222,7 @@
:operatingsystemrelease => '5',
:concat_basedir => '/dne',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand Down Expand Up @@ -541,6 +543,7 @@
:operatingsystemrelease => '9',
:concat_basedir => '/dne',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand Down Expand Up @@ -621,6 +624,7 @@
:operatingsystemrelease => '6',
:concat_basedir => '/dne',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
context 'with a custom apache_name parameter' do
Expand Down Expand Up @@ -659,6 +663,7 @@
{ :osfamily => 'Darwin',
:operatingsystemrelease => '13.1.0',
:concat_basedir => '/dne',
:is_pe => false,
}
end

Expand Down
3 changes: 3 additions & 0 deletions spec/classes/dev_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:operatingsystemrelease => '6',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand All @@ -21,6 +22,7 @@
:osfamily => 'RedHat',
:operatingsystem => 'RedHat',
:operatingsystemrelease => '6',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand All @@ -35,6 +37,7 @@
:osfamily => 'FreeBSD',
:operatingsystem => 'FreeBSD',
:operatingsystemrelease => '9',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand Down
4 changes: 4 additions & 0 deletions spec/classes/mod/alias_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
:operatingsystemrelease => '6',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:concat_basedir => '/dne',
:is_pe => false,
}
end
it { is_expected.to contain_apache__mod("alias") }
Expand All @@ -30,6 +31,7 @@
:operatingsystemrelease => '6',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:concat_basedir => '/dne',
:is_pe => false,
}
end
it { is_expected.to contain_apache__mod("alias") }
Expand All @@ -45,6 +47,7 @@
:operatingsystemrelease => '7',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:concat_basedir => '/dne',
:is_pe => false,
}
end
it { is_expected.to contain_apache__mod("alias") }
Expand All @@ -60,6 +63,7 @@
:operatingsystemrelease => '9',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:concat_basedir => '/dne',
:is_pe => false,
}
end
it { is_expected.to contain_apache__mod("alias") }
Expand Down
3 changes: 3 additions & 0 deletions spec/classes/mod/auth_kerb_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
:operatingsystemrelease => '6',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:concat_basedir => '/dne',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand All @@ -31,6 +32,7 @@
:operatingsystemrelease => '6',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:concat_basedir => '/dne',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand All @@ -47,6 +49,7 @@
:operatingsystemrelease => '9',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:concat_basedir => '/dne',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand Down
2 changes: 2 additions & 0 deletions spec/classes/mod/authnz_ldap_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
:kernel => 'Linux',
:operatingsystem => 'Debian',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand Down Expand Up @@ -49,6 +50,7 @@
:kernel => 'Linux',
:operatingsystem => 'RedHat',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand Down
3 changes: 3 additions & 0 deletions spec/classes/mod/dav_svn_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand All @@ -33,6 +34,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand All @@ -50,6 +52,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand Down
3 changes: 3 additions & 0 deletions spec/classes/mod/deflate_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class { "apache::mod::deflate":
:operatingsystemrelease => '6',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:concat_basedir => '/dne',
:is_pe => false,
}
end

Expand All @@ -67,6 +68,7 @@ class { "apache::mod::deflate":
:operatingsystemrelease => '6',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:concat_basedir => '/dne',
:is_pe => false,
}
end

Expand All @@ -86,6 +88,7 @@ class { "apache::mod::deflate":
:operatingsystemrelease => '9',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:concat_basedir => '/dne',
:is_pe => false,
}
end

Expand Down
1 change: 1 addition & 0 deletions spec/classes/mod/dev_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
:osfamily => osfamily,
:operatingsystem => osfamily,
:operatingsystemrelease => operatingsystemrelease,
:is_pe => false,
}
end
it { is_expected.to contain_class('apache::dev') }
Expand Down
3 changes: 3 additions & 0 deletions spec/classes/mod/dir_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:lsbdistcodename => 'squeeze',
:is_pe => false,
}
end
context "passing no parameters" do
Expand Down Expand Up @@ -48,6 +49,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
context "passing no parameters" do
Expand Down Expand Up @@ -79,6 +81,7 @@
:id => 'root',
:kernel => 'FreeBSD',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
context "passing no parameters" do
Expand Down
3 changes: 3 additions & 0 deletions spec/classes/mod/event_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
:id => 'root',
:kernel => 'FreeBSD',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand All @@ -31,6 +32,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand Down Expand Up @@ -108,6 +110,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand Down
2 changes: 2 additions & 0 deletions spec/classes/mod/fastcgi_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand All @@ -33,6 +34,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand Down
4 changes: 4 additions & 0 deletions spec/classes/mod/fcgid_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand All @@ -35,6 +36,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand Down Expand Up @@ -79,6 +81,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand All @@ -103,6 +106,7 @@
:id => 'root',
:kernel => 'FreeBSD',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand Down
3 changes: 3 additions & 0 deletions spec/classes/mod/info_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ def general_info_specs
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand All @@ -104,6 +105,7 @@ def general_info_specs
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand All @@ -126,6 +128,7 @@ def general_info_specs
:id => 'root',
:kernel => 'FreeBSD',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand Down
2 changes: 2 additions & 0 deletions spec/classes/mod/itk_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand Down Expand Up @@ -60,6 +61,7 @@
:id => 'root',
:kernel => 'FreeBSD',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand Down
3 changes: 3 additions & 0 deletions spec/classes/mod/mime_magic_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ def general_mime_magic_specs
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand Down Expand Up @@ -65,6 +66,7 @@ def general_mime_magic_specs
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand All @@ -91,6 +93,7 @@ def general_mime_magic_specs
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand Down
2 changes: 2 additions & 0 deletions spec/classes/mod/mime_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ def general_mime_specs
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand All @@ -40,6 +41,7 @@ def general_mime_specs
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand Down
1 change: 1 addition & 0 deletions spec/classes/mod/negotiation_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
:concat_basedir => '/dne',
:id => 'root',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end

Expand Down
2 changes: 2 additions & 0 deletions spec/classes/mod/pagespeed_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand All @@ -33,6 +34,7 @@
:id => 'root',
:kernel => 'Linux',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:is_pe => false,
}
end
it { is_expected.to contain_class("apache::params") }
Expand Down
Loading

0 comments on commit 0c032c7

Please sign in to comment.