From efe187953c434493d5f806a6f4fe6ff0e17c01a9 Mon Sep 17 00:00:00 2001
From: Vlad <site.github@mrcasual.com>
Date: Tue, 17 Jan 2017 08:30:15 -0500
Subject: [PATCH] - Mocks a list of permitted assets

---
 tests/unit/Util/ConflictResolverTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/unit/Util/ConflictResolverTest.php b/tests/unit/Util/ConflictResolverTest.php
index 6e15a7d2e5..7cb6cab984 100644
--- a/tests/unit/Util/ConflictResolverTest.php
+++ b/tests/unit/Util/ConflictResolverTest.php
@@ -7,6 +7,10 @@ class ConflictResolverTest extends MailPoetTest {
 
   function __construct() {
     $this->conflict_resolver = new ConflictResolver();
+    $this->conflict_resolver->allowed_assets = array(
+      'scripts' => array('abc', 'xyz'),
+      'styles' => array('abc', 'xyz'),
+    );
     $this->conflict_resolver->init();
     global $wp_filter;
     $this->wp_filter = $wp_filter;