Don't include helpers in the universal dsl

libraries/helpers.rb

@@ -103,5 +103,3 @@ def ubuntu_18?
     end
   end
 end
-
-Chef::DSL::Universal.include(Nginx::Cookbook::Helpers)

resources/config.rb

@@ -15,6 +15,8 @@
 # limitations under the License.
 #
 
+include Nginx::Cookbook::Helpers
+
 deprecated_property_alias 'user',
                           'process_user',
                           'The user property was renamed process_user in the 11.3 release of this cookbook. Please update your cookbooks to use the new property name. This alias will be removed in the next major version.'

resources/install.rb

@@ -15,6 +15,8 @@
 # limitations under the License.
 #
 
+include Nginx::Cookbook::Helpers
+
 property :ohai_plugin_enabled, [true, false],
           description: 'Whether or not ohai_plugin is enabled.',
           default: true
@@ -39,6 +41,8 @@
           coerce: proc { |p| p.is_a?(Array) ? p : [p] }
 
 action_class do
+  include Nginx::Cookbook::Helpers
+
   def ohai_plugin_enabled?
     new_resource.ohai_plugin_enabled
   end

resources/service.rb

@@ -15,6 +15,8 @@
 # limitations under the License.
 #
 
+include Nginx::Cookbook::Helpers
+
 property :service_name, String,
           default: lazy { default_nginx_service_name },
           description: 'The service name to perform actions upon'

resources/site.rb

@@ -15,6 +15,8 @@
 # limitations under the License.
 #
 
+include Nginx::Cookbook::Helpers
+
 property :conf_dir, String,
           description: 'The directory to create the site configuraiton file in.',
           default: lazy { nginx_config_site_dir }

spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 require 'chefspec/berkshelf'
-require_relative '../libraries/helpers'
 
+Dir['libraries/*.rb'].sort.each { |f| require File.expand_path(f) }
 Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 
 RSpec.configure do |config|

spec/support/install.rb

@@ -1,4 +1,4 @@
-def repo_url
+def platform_repo_url
   case chefspec_platform
   when 'amazon', 'fedora', 'redhat'
     'https://nginx.org/packages/rhel/7/$basearch'

spec/unit/resources/config_spec.rb

@@ -2,7 +2,7 @@
 
 describe 'nginx_config' do
   step_into :nginx_config, :nginx_install, :nginx_site
-  platform  'ubuntu'
+  platform 'centos'
 
   before do
     stub_command('/usr/sbin/nginx -t').and_return(true)
@@ -21,8 +21,8 @@
         .with_variables(
           nginx_dir: '/etc/nginx',
           nginx_log_dir: '/var/log/nginx',
-          process_user: 'www-data',
-          process_group: 'www-data',
+          process_user: 'nginx',
+          process_group: 'nginx',
           worker_processes: 'auto',
           pid: '/run/nginx.pid',
           worker_connections: '1024',
@@ -43,11 +43,11 @@
           nginx_log_dir: '/var/log/nginx',
           port: '80',
           server_name: 'Fauxhai',
-          default_root: '/var/www/html'
+          default_root: '/usr/share/nginx/html'
         )
     end
 
-    it { is_expected.to create_directory('/var/log/nginx').with_mode('0750').with_owner(nginx_user) }
+    it { is_expected.to create_directory('/var/log/nginx').with_mode('0750').with_owner('nginx') }
     it { is_expected.to create_directory('/etc/nginx/conf.d').with_mode('0750') }
     it { is_expected.to create_directory('/etc/nginx/conf.http.d').with_mode('0750') }
   end

spec/unit/resources/install_spec.rb

@@ -2,6 +2,7 @@
 
 describe 'nginx_install' do
   step_into :nginx_install
+  platform 'centos'
 
   before do
     stub_command('dnf module list nginx | grep -q "^nginx.*\\[x\\]"').and_return(false)
@@ -71,15 +72,15 @@
       shared_examples_for 'yum repository is created' do
         it do
           is_expected.to create_yum_repository('nginx')
-            .with_baseurl(repo_url)
+            .with_baseurl(platform_repo_url)
             .with_gpgkey(repo_signing_key)
         end
       end
 
       shared_examples_for 'apt repository is added' do
         it do
           is_expected.to add_apt_repository('nginx')
-            .with_uri(repo_url)
+            .with_uri(platform_repo_url)
             .with_distribution(platform_distribution_nginx)
             .with_components(%w(nginx))
             .with_deb_src(true)
@@ -125,7 +126,7 @@
 
         it do
           is_expected.to create_zypper_repository('nginx')
-            .with_baseurl(repo_url)
+            .with_baseurl(platform_repo_url)
             .with_gpgkey(repo_signing_key)
         end
       end