#191: review #2

as-ideas · Aug 17, 2018 · 9c61991 · 9c61991
1 parent d60303b
commit 9c61991
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/test/specs/core/core_oil.spec.js b/test/specs/core/core_oil.spec.js
@@ -7,7 +7,6 @@ import * as CoreTagManagement from '../../../src/scripts/core/core_tag_managemen
 import { waitsForAndRuns } from '../../test-utils/utils_wait';
 import { resetOil } from '../../test-utils/utils_reset';
 import { triggerEvent } from '../../test-utils/utils_events';
-import { EVENT_NAME_OIL_SHOWN } from '../../../src/scripts/core/core_constants';
 
 describe('core_oil', () => {
 
@@ -110,12 +109,4 @@ describe('core_oil', () => {
       },
       2000);
   });
-
-  fit('should not execute oil_shown event if gdpr_applies_globally is false', (done) => {
-    spyOn(CoreUtils, 'sendEventToHostSite').and.callThrough();
-    initOilLayer({"gdpr_applies_globally": false});
-
-    expect(CoreUtils.sendEventToHostSite).not.toHaveBeenCalledWith(EVENT_NAME_OIL_SHOWN);
-    done();
-  });
 });
diff --git a/test/specs/userview/userview_modal.spec.js b/test/specs/userview/userview_modal.spec.js
@@ -4,6 +4,9 @@ import { resetOil } from '../../test-utils/utils_reset';
 import * as AdvancedSettingsStandard from '../../../src/scripts/userview/view/oil.advanced.settings.standard';
 import * as AdvancedSettingsTabs from '../../../src/scripts/userview/view/oil.advanced.settings.tabs';
 import * as CoreLog from '../../../src/scripts/core/core_log';
+import * as CoreConfig from '../../../src/scripts/core/core_config';
+import * as CoreUtils from '../../../src/scripts/core/core_utils';
+import {EVENT_NAME_OIL_SHOWN} from '../../../src/scripts/core/core_constants';
 
 describe('the user view modal aka the oil layer wrapper', () => {
 
@@ -116,6 +119,15 @@ describe('the user view modal aka the oil layer wrapper', () => {
       expect(CoreLog.logError).toHaveBeenCalled();
       expect(CoreLog.logError.calls.mostRecent().args[0]).toMatch(/^Found unknown CPC type 'invalidCpcType'/)
     });
+
+    it('should not execute oil_shown event if gdpr_applies is FALSE', (done) => {
+      spyOn(CoreConfig, 'gdprApplies').and.returnValue(false);
+      spyOn(CoreUtils, 'sendEventToHostSite').and.callThrough();
+
+      renderOil({optIn: false, advancedSettings: true});
+      expect(CoreUtils.sendEventToHostSite).not.toHaveBeenCalledWith(EVENT_NAME_OIL_SHOWN);
+      done();
+    });
   });
 
   function expectTimeoutNotStarted() {