From e0e32d1b52c763ce4f229b6e272eca3399a8d020 Mon Sep 17 00:00:00 2001 From: Alexis Hancock Date: Tue, 11 Dec 2018 14:39:17 -0800 Subject: [PATCH 1/7] Change HTTP Block language - For better user clarity for when they request unencrypted requests --- src/chrome/locale/en/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/https-everywhere.dtd b/src/chrome/locale/en/https-everywhere.dtd index 3b4b02e3a41c..dc268a6ab487 100644 --- a/src/chrome/locale/en/https-everywhere.dtd +++ b/src/chrome/locale/en/https-everywhere.dtd @@ -8,7 +8,7 @@ - + From f30e373c301c9c6770d43f24247df4aaf10f7fef Mon Sep 17 00:00:00 2001 From: Alexis Hancock Date: Wed, 19 Dec 2018 17:58:21 -0800 Subject: [PATCH 2/7] Describe Cookie Rule Function --- chromium/test/rules_test.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/chromium/test/rules_test.js b/chromium/test/rules_test.js index b859e691a2a1..2ab1174b445a 100644 --- a/chromium/test/rules_test.js +++ b/chromium/test/rules_test.js @@ -6,7 +6,8 @@ const assert = require('chai').assert, const Rule = rules.Rule, RuleSet = rules.RuleSet, RuleSets = rules.RuleSets, - getRule = rules.getRule; + getRule = rules.getRule, + cookieRule = rules.CookieRule; describe('rules.js', function() { @@ -40,6 +41,14 @@ describe('rules.js', function() { }); }); + describe('CookieRule' function(){ + it('returns cookie rule', function() { + let trivial_cookie_rule = rules.trivial_cookie_rule_c; + let cookieRule = cookieRule('.+', '.+'); + assert.equal(trivial_cookie_rule, cookieRule); + }); + }); + describe('RuleSet', function() { beforeEach(function() { this.ruleset = new RuleSet('set_name', true, 'note'); From 7b9592fa0269461c26a259c2848c15282020f94f Mon Sep 17 00:00:00 2001 From: Alexis Hancock Date: Thu, 3 Jan 2019 17:07:06 -0800 Subject: [PATCH 3/7] Change variable name --- chromium/pages/popup/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/pages/popup/index.html b/chromium/pages/popup/index.html index 8097c5bdd244..a25b26e8b538 100644 --- a/chromium/pages/popup/index.html +++ b/chromium/pages/popup/index.html @@ -21,7 +21,7 @@

From 719081bfde83b373e59073d7648778c59e67b6f2 Mon Sep 17 00:00:00 2001 From: Alexis Hancock Date: Thu, 3 Jan 2019 17:14:34 -0800 Subject: [PATCH 4/7] Change variable name (dtd file) --- src/chrome/locale/en/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/https-everywhere.dtd b/src/chrome/locale/en/https-everywhere.dtd index dc268a6ab487..06566073d781 100644 --- a/src/chrome/locale/en/https-everywhere.dtd +++ b/src/chrome/locale/en/https-everywhere.dtd @@ -8,7 +8,7 @@ - + From b2deb3fb7d7453982505f9a8b0f0d170823b7a1e Mon Sep 17 00:00:00 2001 From: Alexis Hancock Date: Thu, 3 Jan 2019 17:36:12 -0800 Subject: [PATCH 5/7] Remove rogue code - Looks like reversion failed, removing --- chromium/test/rules_test.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/chromium/test/rules_test.js b/chromium/test/rules_test.js index 2ab1174b445a..a11f3fa2b2f0 100644 --- a/chromium/test/rules_test.js +++ b/chromium/test/rules_test.js @@ -6,8 +6,6 @@ const assert = require('chai').assert, const Rule = rules.Rule, RuleSet = rules.RuleSet, RuleSets = rules.RuleSets, - getRule = rules.getRule, - cookieRule = rules.CookieRule; describe('rules.js', function() { @@ -41,14 +39,6 @@ describe('rules.js', function() { }); }); - describe('CookieRule' function(){ - it('returns cookie rule', function() { - let trivial_cookie_rule = rules.trivial_cookie_rule_c; - let cookieRule = cookieRule('.+', '.+'); - assert.equal(trivial_cookie_rule, cookieRule); - }); - }); - describe('RuleSet', function() { beforeEach(function() { this.ruleset = new RuleSet('set_name', true, 'note'); From df5506e185ad24bfb5deb4e241c0f7f0f1a458fa Mon Sep 17 00:00:00 2001 From: Alexis Hancock Date: Thu, 3 Jan 2019 17:40:04 -0800 Subject: [PATCH 6/7] Fix syntax error --- chromium/test/rules_test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/test/rules_test.js b/chromium/test/rules_test.js index a11f3fa2b2f0..b5efb71fc8c3 100644 --- a/chromium/test/rules_test.js +++ b/chromium/test/rules_test.js @@ -5,7 +5,7 @@ const assert = require('chai').assert, const Rule = rules.Rule, RuleSet = rules.RuleSet, - RuleSets = rules.RuleSets, + RuleSets = rules.RuleSets describe('rules.js', function() { From 8b5d60d3d39823eb8ce338ea4418c9d4362c161e Mon Sep 17 00:00:00 2001 From: Alexis Hancock Date: Thu, 3 Jan 2019 17:54:59 -0800 Subject: [PATCH 7/7] Add back missing rule - ugh --- chromium/test/rules_test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chromium/test/rules_test.js b/chromium/test/rules_test.js index b5efb71fc8c3..b859e691a2a1 100644 --- a/chromium/test/rules_test.js +++ b/chromium/test/rules_test.js @@ -5,7 +5,8 @@ const assert = require('chai').assert, const Rule = rules.Rule, RuleSet = rules.RuleSet, - RuleSets = rules.RuleSets + RuleSets = rules.RuleSets, + getRule = rules.getRule; describe('rules.js', function() {