Merge pull request #7 in EXTENSIONS/browser-extension from feature/is…

…sues/665-domain-modifier to master Squashed commit of the following: commit a435e34d4df942805ba42a1af8cdbb124f84ff8b Author: a.tropnikov <atropnikov@adguard.com> Date: Mon Aug 28 12:54:23 2017 +0300 Fixed test commit 86dbdfe8d45892cd927bdbe46f3ff2f01940536f Author: a.tropnikov <atropnikov@adguard.com> Date: Mon Aug 28 12:46:49 2017 +0300 Fixed crop www. in $domain modifier
AdguardTeam · Aug 29, 2017 · 3da5a9b · 3da5a9b
1 parent a1c27f0
commit 3da5a9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Extension/lib/filter/rules/base-filter-rule.js b/Extension/lib/filter/rules/base-filter-rule.js
@@ -63,7 +63,7 @@
                             if (permittedDomains === null) {
                                 permittedDomains = [];
                             }
-                            permittedDomains.push(adguard.utils.url.getCroppedDomainName(domainName));
+                            permittedDomains.push(domainName);
                         }
                     }
                 }

diff --git a/Extension/tests/css-filter/test-css-filter.js b/Extension/tests/css-filter/test-css-filter.js
@@ -611,7 +611,7 @@ QUnit.test("Css Filter WWW Test", function (assert) {
     var rule = new adguard.rules.CssFilterRule(ruleText);
 
     assert.ok(rule != null);
-    assert.equal(rule.permittedDomain, 'google.com');
+    assert.equal(rule.permittedDomain, 'www.google.com');
 });
 
 QUnit.test("Permitted/Restricted domains Test", function (assert) {