reorganized

mandric · Mar 12, 2019 · 58fd6c3 · 58fd6c3
1 parent 4e5a990
commit 58fd6c3
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 34 deletions.
diff --git a/package.json b/package.json
@@ -10,9 +10,9 @@
     "test": "tests"
   },
   "scripts": {
-    "server": "http-server -c-1 src",
-    "build": "parcel build --public-url ./ --no-minify --no-source-maps src/manifest.json",
-    "build:prod": "parcel build --public-url ./ src/manifest.json",
+    "server": "http-server -c-1 dist",
+    "start": "parcel src/manifest.json",
+    "build": "parcel build --public-url ./ src/manifest.json",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],

diff --git a/src/background.js b/src/background.js
@@ -54,6 +54,9 @@ const tabRemoved = (id, props) => {
   state.unset(id);
 }
 
+console.log('browser');
+console.log(browser);
+
 browser.tabs.onActivated.addListener(tabActivated);
 browser.tabs.onUpdated.addListener(tabUpdated);
 browser.tabs.onRemoved.addListener(tabRemoved);

diff --git a/src/manifest.json b/src/manifest.json
@@ -13,6 +13,6 @@
     "default_popup": "popup.html"
   },
   "web_accessible_resources": [
-    "test.html"
+    "test/index.html"
   ]
 }
diff --git a/src/popup.js b/src/popup.js
@@ -5,5 +5,5 @@ document.getElementById('reset').onclick = function(el) {
   browser.runtime.reload()
 }
 document.getElementById('test').onclick = function(el) {
-  window.open(browser.extension.getURL("test.html"), '_blank')
+  window.open(browser.extension.getURL("test/index.html"), '_blank')
 }
diff --git a/src/test.html b/src/test.html
diff --git a/src/background.test.js → src/test/background.test.js b/src/background.test.js → src/test/background.test.js
@@ -1,5 +1,5 @@
 import chai from './chai.js'
-import browser from './browser.js'
+import browser from '../browser.js'
 
 const expect = chai.expect
 

diff --git a/src/chai.js → src/test/chai.js b/src/chai.js → src/test/chai.js
diff --git a/src/test/index.html b/src/test/index.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Mocha Tests</title>
+    <link href="mocha.css" rel="stylesheet" />
+    <script src="mocha.js"></script>
+</head>
+<body>
+<div id="mocha"></div>
+<script src="setup.js"></script>
+<script src="run.js"></script>
+</body>
+</html>
diff --git a/src/mocha.css → src/test/mocha.css b/src/mocha.css → src/test/mocha.css
diff --git a/src/mocha.js → src/test/mocha.js b/src/mocha.js → src/test/mocha.js
@@ -17903,7 +17903,7 @@ function hasOwnProperty(obj, prop) {
 },{"./support/isBuffer":87,"_process":68,"inherits":86}],89:[function(require,module,exports){
 module.exports={
   "name": "mocha",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "homepage": "https://mochajs.org/",
   "notifyLogo": "https://ibin.co/4QuRuGjXvl36.png"
 }

diff --git a/src/test/run.js b/src/test/run.js
@@ -0,0 +1,4 @@
+import './state.test.js';
+import './background.test.js';
+
+mocha.run();
diff --git a/src/test/setup.js b/src/test/setup.js
@@ -0,0 +1,3 @@
+import './chai.js';
+
+mocha.setup('bdd');
diff --git a/src/state.test.js → src/test/state.test.js b/src/state.test.js → src/test/state.test.js
@@ -1,6 +1,6 @@
 console.log('testing state lib')
 import chai from './chai.js'
-import state from './state.js'
+import state from '../state.js'
 
 const expect = chai.expect
 
@@ -10,7 +10,6 @@ const populate = (length) => {
   }
 }
 
-
 describe('state lib', () => {
 
   beforeEach(() => {

diff --git a/src/testrun.js b/src/testrun.js
diff --git a/src/testsetup.js b/src/testsetup.js