wip

Author: osbre

src/Plugin.php

@@ -46,18 +46,17 @@ public function boot(): void
 
     public function onInit(): void
     {
-        $tracking = ! $this->trackingRules->hasExcludedIp();
-        $excludedRole = $this->trackingRules->hasExcludedUserRole();
+        $tracking = $this->trackingRules->hasExcludedIp() && $this->trackingRules->hasExcludedUserRole();
 
         if ($tracking && $this->settings->get(SettingName::NOSCRIPT)) {
             AddNoScriptTag::register();
         }
 
-        if (! $excludedRole) {
+        if (! $tracking) {
             AddInactiveComment::register();
         }
 
-        if ($tracking && ! $excludedRole) {
+        if ($tracking) {
             $this->scripts->push(new AnalyticsScript);
         } else {
             $this->scripts->push(new InactiveScript);

tests/Browser/PluginSettingsTest.php

@@ -6,7 +6,7 @@
 
 const SA_ADMIN_NOTICE = '<!-- Simple Analytics: Not logging requests from admins -->';
 const SA_DEFAULT_SCRIPT = 'src="https://scripts.simpleanalyticscdn.com/latest.js"></script>';
-const SA_INACTIVE_ADMIN_SCRIPT = 'resources/js/inactive.js"></script>';
+const SA_INACTIVE_ADMIN_SCRIPT = 'src="http://localhost:8100/wp-content/plugins/simpleanalytics/resources/js/inactive.js"></script>';
 
 const WP_PLUGIN_ROW_SELECTOR = 'tr[data-slug="simpleanalytics"]';
 const WP_ACTIVATE_PLUGIN_SELECTOR = '#activate-simpleanalytics';