Merge pull request #6 from ivantsov/issue-3

Fix for issue #3 and #5
ivantsov · Apr 15, 2016 · 2c0fe84 · 2c0fe84
2 parents de9a0d9 + bf2d797
commit 2c0fe84
Show file tree

Hide file tree

Showing 52 changed files with 994 additions and 865 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,8 +1,14 @@
 {
     "extends": "airbnb",
-	"ecmaFeatures": {
-		"experimentalObjectRestSpread": true
-	},
+    "env": {
+        "jasmine": true,
+        "jest": true
+    },
+    "parserOptions": {
+        "ecmaFeatures": {
+            "experimentalObjectRestSpread": true
+        }
+    },
     "rules": {
         "indent": [2, 4, {"SwitchCase": 1}],
         "comma-dangle": [2, "never"],
@@ -23,7 +29,10 @@
             "initialized": "never",
             "uninitialized": "always"
         }],
+        "one-var-declaration-per-line": [2, "initializations"],
         "func-names": 0,
+        "object-curly-spacing": [2, "never"],
+        "max-len": 0,
         "react/sort-comp": [2, {
             "order": [
                 "lifecycle",
@@ -33,6 +42,9 @@
                 "/^(get|set)(?!(InitialState$|DefaultProps$|ChildContext$)).+$/",
                 "everything-else"
             ]
-        }]
+        }],
+        "react/jsx-indent-props": [2, 4],
+        "react/prefer-es6-class": [2, "never"],
+        "react/jsx-space-before-closing": [2, "never"]
     }
 }
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Tunable Firefox extension for Yandex.Mail with lots of features.
 * Handles emails from all folders
 * English and Russian localizations
 * Tunable desktop and sound notifications for new and unread emails
-* Panel for quick work with mail
+* Panel for quick work with emails
 * Indicator and notifications when you're not authorized
 
 The addon is built with [JPM](https://developer.mozilla.org/Add-ons/SDK/Tools/jpm).

diff --git a/data/blank.html b/data/blank.html
@@ -1 +1,8 @@
-<!-- blank -->
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title></title>
+</head>
+<body></body>
+</html>
diff --git a/data/scripts/socket.js b/data/scripts/socket.js
@@ -2,18 +2,18 @@ let WS;
 const emitEvent = self.port.emit;
 const addListener = self.port.on;
 
-function onOpen() {
-    console.log('Socket opened', arguments); // eslint-disable-line no-console
+function onOpen(...args) {
+    console.log('Socket opened', args); // eslint-disable-line no-console
 }
 
-function onClose() {
-    console.error('Socket closed', arguments); // eslint-disable-line no-console
+function onClose(...args) {
+    console.error('Socket closed', args); // eslint-disable-line no-console
 
     emitEvent('reconnect');
 }
 
-function onError() {
-    console.error('Error occurred in socket', arguments); // eslint-disable-line no-console
+function onError(...args) {
+    console.error('Error occurred in socket', args); // eslint-disable-line no-console
 
     emitEvent('reconnect');
 }

diff --git a/[email protected] → [email protected] b/[email protected] → [email protected]
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "title": "Yandex.Mail notifier",
   "name": "yandex-mail-notifier",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Tunable notifier for Yandex.Mail",
   "id": "jid0-vsitoD18LSTi4VQGGLCVmIoJSsU@jetpack",
-  "icon": "resource://yandex-mail-notifier/data/icons/addon-logo.png",
+  "icon": "resource://@yandex-mail-notifier/data/icons/addon-logo.png",
   "main": "index.js",
   "author": {
     "name": "Alexander Ivantsov",
@@ -28,44 +28,40 @@
     "build:watch": "webpack --config webpack.config.dev.js --watch"
   },
   "jest": {
-    "testRunner": "<rootDir>/node_modules/jest-cli/src/testRunners/jasmine/jasmine2",
-    "scriptPreprocessor": "<rootDir>/node_modules/babel-jest",
+    "testDirectoryName": "tests",
     "unmockedModulePathPatterns": [
       "<rootDir>/node_modules/react",
       "<rootDir>/node_modules/react-dom",
-      "<rootDir>/node_modules/react-addons-test-utils",
-      "<rootDir>/node_modules/fbjs"
-    ],
-    "modulePathIgnorePatterns": [
-      "<rootDir>/node_modules/"
+      "<rootDir>/node_modules/react-addons-test-utils"
     ]
   },
   "devDependencies": {
-    "babel-core": "^6.1.2",
-    "babel-jest": "^6.0.1",
-    "babel-loader": "^6.0.1",
-    "babel-plugin-syntax-object-rest-spread": "^6.0.14",
-    "babel-plugin-transform-es2015-destructuring": "^6.1.18",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.1.3",
-    "babel-plugin-transform-es2015-parameters": "^6.1.18",
-    "babel-plugin-transform-es2015-shorthand-properties": "^6.1.18",
-    "babel-plugin-transform-es2015-spread": "^6.1.18",
-    "babel-plugin-transform-object-rest-spread": "^6.0.14",
-    "babel-preset-react": "^6.1.2",
-    "coveralls": "^2.11.4",
-    "eslint": "^1.9.0",
-    "eslint-config-airbnb": "^2.0.0",
-    "eslint-plugin-react": "^3.8.0",
-    "jest-cli": "^0.8.0",
-    "react-addons-test-utils": "^0.14.2",
-    "webpack": "^1.12.3"
+    "babel-core": "^6.7.6",
+    "babel-jest": "^11.0.1",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-syntax-object-rest-spread": "^6.5.0",
+    "babel-plugin-transform-es2015-destructuring": "^6.6.5",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.7.4",
+    "babel-plugin-transform-es2015-parameters": "^6.7.0",
+    "babel-plugin-transform-es2015-shorthand-properties": "^6.5.0",
+    "babel-plugin-transform-es2015-spread": "^6.6.5",
+    "babel-plugin-transform-object-rest-spread": "^6.6.5",
+    "babel-preset-react": "^6.5.0",
+    "coveralls": "^2.11.9",
+    "eslint": "^2.7.0",
+    "eslint-config-airbnb": "^7.0.0",
+    "eslint-plugin-jsx-a11y": "^0.6.2",
+    "eslint-plugin-react": "^4.3.0",
+    "jest-cli": "^11.0.1",
+    "react-addons-test-utils": "^15.0.1",
+    "webpack": "^1.12.15"
   },
   "dependencies": {
-    "react": "^0.14.2",
-    "react-dom": "^0.14.2",
-    "react-redux": "^4.0.0",
-    "redux": "^3.0.4",
-    "redux-thunk": "^1.0.0"
+    "react": "^15.0.1",
+    "react-dom": "^15.0.1",
+    "react-redux": "^4.4.5",
+    "redux": "^3.4.0",
+    "redux-thunk": "^2.0.1"
   },
   "permissions": {
     "cross-domain-content": [

diff --git a/src/panel/__tests__/.eslintrc b/src/panel/__tests__/.eslintrc
diff --git a/src/panel/__tests__/actions.js b/src/panel/__tests__/actions.js
diff --git a/src/panel/__tests__/components/app.js b/src/panel/__tests__/components/app.js