Provide an easy way to run acceptance test via rake rspec

When either ZABBIX_RUN_ACCEPTANCE or ZABBIX_HOST_URL is set as an environment variable, it's considered that the user opts in to acceptance tests. The acceptance tests previously didn't have the _spec suffix, so they weren't picked up by the file filter. The acceptance tests are dangerous on a production system, so they are now flagged with their own type. Flagging also makes it possible to include specific contexts just for acceptance tests.
express42 · Dec 30, 2023 · 80e0d56 · 80e0d56
1 parent 04bc541
commit 80e0d56
Show file tree

Hide file tree

Showing 26 changed files with 14 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -63,4 +63,6 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
     - name: Run tests
-      run: bundle exec rspec ./spec/*
+      run: bundle exec rake spec
+      env:
+        ZABBIX_RUN_ACCEPTANCE: true
diff --git a/spec/action.rb → spec/acceptance/action_spec.rb b/spec/action.rb → spec/acceptance/action_spec.rb
diff --git a/spec/application.rb → spec/acceptance/application_spec.rb b/spec/application.rb → spec/acceptance/application_spec.rb
diff --git a/spec/basic_func.rb → spec/acceptance/basic_func_spec.rb b/spec/basic_func.rb → spec/acceptance/basic_func_spec.rb
diff --git a/spec/configuration.rb → spec/acceptance/configuration_spec.rb b/spec/configuration.rb → spec/acceptance/configuration_spec.rb
diff --git a/spec/drule.rb → spec/acceptance/drule_spec.rb b/spec/drule.rb → spec/acceptance/drule_spec.rb
diff --git a/spec/event.rb → spec/acceptance/event_spec.rb b/spec/event.rb → spec/acceptance/event_spec.rb
diff --git a/spec/graph.rb → spec/acceptance/graph_spec.rb b/spec/graph.rb → spec/acceptance/graph_spec.rb
diff --git a/spec/host.rb → spec/acceptance/host_spec.rb b/spec/host.rb → spec/acceptance/host_spec.rb
diff --git a/spec/hostgroup.rb → spec/acceptance/hostgroup_spec.rb b/spec/hostgroup.rb → spec/acceptance/hostgroup_spec.rb
diff --git a/spec/httptest.rb → spec/acceptance/httptest_spec.rb b/spec/httptest.rb → spec/acceptance/httptest_spec.rb
diff --git a/spec/item.rb → spec/acceptance/item_spec.rb b/spec/item.rb → spec/acceptance/item_spec.rb
diff --git a/spec/maintenance.rb → spec/acceptance/maintenance_spec.rb b/spec/maintenance.rb → spec/acceptance/maintenance_spec.rb
diff --git a/spec/mediatype.rb → spec/acceptance/mediatype_spec.rb b/spec/mediatype.rb → spec/acceptance/mediatype_spec.rb
diff --git a/spec/problem.rb → spec/acceptance/problem_spec.rb b/spec/problem.rb → spec/acceptance/problem_spec.rb
diff --git a/spec/query.rb → spec/acceptance/query_spec.rb b/spec/query.rb → spec/acceptance/query_spec.rb
diff --git a/spec/screen.rb → spec/acceptance/screen_spec.rb b/spec/screen.rb → spec/acceptance/screen_spec.rb
diff --git a/spec/script.rb → spec/acceptance/script_spec.rb b/spec/script.rb → spec/acceptance/script_spec.rb
diff --git a/spec/server.rb → spec/acceptance/server_spec.rb b/spec/server.rb → spec/acceptance/server_spec.rb
diff --git a/spec/template.rb → spec/acceptance/template_spec.rb b/spec/template.rb → spec/acceptance/template_spec.rb
diff --git a/spec/trigger.rb → spec/acceptance/trigger_spec.rb b/spec/trigger.rb → spec/acceptance/trigger_spec.rb
diff --git a/spec/user.rb → spec/acceptance/user_spec.rb b/spec/user.rb → spec/acceptance/user_spec.rb
diff --git a/spec/usergroup.rb → spec/acceptance/usergroup_spec.rb b/spec/usergroup.rb → spec/acceptance/usergroup_spec.rb
diff --git a/spec/usermacro.rb → spec/acceptance/usermacro_spec.rb b/spec/usermacro.rb → spec/acceptance/usermacro_spec.rb
diff --git a/spec/valuemap.rb → spec/acceptance/valuemap_spec.rb b/spec/valuemap.rb → spec/acceptance/valuemap_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,5 +1,16 @@
 require 'zabbixapi'
 
+RSpec.configure do |config|
+  config.define_derived_metadata(file_path: %r{/spec/acceptance/}) do |metadata|
+    metadata[:type] = :acceptance
+  end
+
+  # Don't run acceptance tests unless a host is provided
+  unless (ENV.key?('ZABBIX_HOST_URL') || ENV.key?('ZABBIX_RUN_ACCEPTANCE'))
+    config.filter_run_excluding type: :acceptance
+  end
+end
+
 def zbx
   # settings
   @api_url = ENV['ZABBIX_HOST_URL'] || 'http://localhost:8080/api_jsonrpc.php'