Merge pull request #993 from pixelated/login-errors

Login errors - some refactorings

28 files changed, 40 insertions, 39 deletions

diff --git a/.gitignore b/.gitignore
index 8a974601..52a387de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ service/_trial_temp/
 _trial_temp
 web-ui/coverage
 .nyc_output
+web-ui/npm-debug.log.*
diff --git a/web-ui/package.json b/web-ui/package.json
index 63272743..a9cb9604 100644
--- a/web-ui/package.json
+++ b/web-ui/package.json
@@ -80,7 +80,7 @@
     "test:unit": "npm run test:coverage && npm run test:karma",
     "test:integration": "mocha-webpack --webpack-config webpack.test.config.js --require test/integration/setup.js \"test/integration/**/*.spec.js\"",
     "test:coverage": "NODE_ENV=test nyc --check-coverage npm run test:mocha",
-    "test:mocha": "mocha-webpack --webpack-config webpack.test.config.js \"test/unit/**/*.spec.js\"",
+    "test:mocha": "mocha-webpack --webpack-config webpack.test.config.js \"src/**/*.spec.js\"",
     "test:karma": "karma start --single-run $GRUNT_OPTS",
     "test:watch:mocha": "npm run test:mocha -- --watch",
     "test:watch:karma": "karma start",
diff --git a/web-ui/test/unit/backup_account/page.spec.js b/web-ui/src/backup_account/page.spec.js
index 66d2dc78..ece61336 100644
--- a/web-ui/test/unit/backup_account/page.spec.js
+++ b/web-ui/src/backup_account/page.spec.js
@@ -3,7 +3,7 @@ import expect from 'expect';
 import React from 'react';
 import { Page } from 'src/backup_account/page';
 
-describe('Page', () => {
+describe('BackupAccount', () => {
   let page;
 
   beforeEach(() => {
diff --git a/web-ui/src/common/app.js b/web-ui/src/common/app.js
index f6594557..03a69fc9 100644
--- a/web-ui/src/common/app.js
+++ b/web-ui/src/common/app.js
@@ -18,7 +18,7 @@
 import React from 'react';
 import { I18nextProvider } from 'react-i18next';
 
-import internationalization from '../i18n';
+import internationalization from 'src/common/i18n';
 
 const App = ({ i18n = internationalization, child }) => (
   <I18nextProvider i18n={i18n}>
diff --git a/web-ui/test/unit/common/footer/footer.spec.js b/web-ui/src/common/footer/footer.spec.js
index f1247233..f1247233 100644
--- a/web-ui/test/unit/common/footer/footer.spec.js
+++ b/web-ui/src/common/footer/footer.spec.js
diff --git a/web-ui/test/unit/common/header/header.spec.js b/web-ui/src/common/header/header.spec.js
index 82e29e1c..82e29e1c 100644
--- a/web-ui/test/unit/common/header/header.spec.js
+++ b/web-ui/src/common/header/header.spec.js
diff --git a/web-ui/src/i18n.js b/web-ui/src/common/i18n.js
index db107dc7..db107dc7 100644
--- a/web-ui/src/i18n.js
+++ b/web-ui/src/common/i18n.js
diff --git a/web-ui/src/common/input_field/input_field.js b/web-ui/src/common/input_field/input_field.js
index d4876d9f..a92faeb9 100644
--- a/web-ui/src/common/input_field/input_field.js
+++ b/web-ui/src/common/input_field/input_field.js
@@ -17,7 +17,7 @@
 
 import React from 'react';
 
-import './input-field.scss';
+import './input_field.scss';
 
 const InputField = ({ label, name, type = 'text' }) => (
   <div className='input-field-group'>
diff --git a/web-ui/src/common/input_field/input-field.scss b/web-ui/src/common/input_field/input_field.scss
index dd8e8927..dd8e8927 100644
--- a/web-ui/src/common/input_field/input-field.scss
+++ b/web-ui/src/common/input_field/input_field.scss
diff --git a/web-ui/test/unit/common/input_field/input_field.spec.js b/web-ui/src/common/input_field/input_field.spec.js
index 0c044ce1..0c044ce1 100644
--- a/web-ui/test/unit/common/input_field/input_field.spec.js
+++ b/web-ui/src/common/input_field/input_field.spec.js
diff --git a/web-ui/src/common/submit_button/submit_button.js b/web-ui/src/common/submit_button/submit_button.js
index fb87bf7d..4754e042 100644
--- a/web-ui/src/common/submit_button/submit_button.js
+++ b/web-ui/src/common/submit_button/submit_button.js
@@ -17,7 +17,7 @@
 
 import React from 'react';
 
-import './submit-button.scss';
+import './submit_button.scss';
 
 const SubmitButton = ({ buttonText }) => (
   <input type='submit' className='submit-button' value={buttonText} />
diff --git a/web-ui/src/common/submit_button/submit-button.scss b/web-ui/src/common/submit_button/submit_button.scss
index 13cb7607..13cb7607 100644
--- a/web-ui/src/common/submit_button/submit-button.scss
+++ b/web-ui/src/common/submit_button/submit_button.scss
diff --git a/web-ui/test/unit/common/submit_button/submit_button.spec.js b/web-ui/src/common/submit_button/submit_button.spec.js
index 8279547c..8279547c 100644
--- a/web-ui/test/unit/common/submit_button/submit_button.spec.js
+++ b/web-ui/src/common/submit_button/submit_button.spec.js
diff --git a/web-ui/src/util.js b/web-ui/src/common/util.js
index effb3d9c..effb3d9c 100644
--- a/web-ui/src/util.js
+++ b/web-ui/src/common/util.js
diff --git a/web-ui/test/unit/util.spec.js b/web-ui/src/common/util.spec.js
index 968b2d83..805d9dd5 100644
--- a/web-ui/test/unit/util.spec.js
+++ b/web-ui/src/common/util.spec.js
@@ -1,5 +1,5 @@
 import expect from 'expect';
-import Util from 'src/util';
+import Util from 'src/common/util';
 
 describe('Utils', () => {
   describe('.hasQueryParameter', () => {
diff --git a/web-ui/src/login/about/pixelated_welcome.js b/web-ui/src/login/about/welcome.js
index 82a7d7d0..93aae8e1 100644
--- a/web-ui/src/login/about/pixelated_welcome.js
+++ b/web-ui/src/login/about/welcome.js
@@ -18,10 +18,10 @@
 import React from 'react';
 import { translate } from 'react-i18next';
 
-import './pixelated-welcome.scss';
+import './welcome.scss';
 
-export const PixelatedWelcome = ({ t }) => (
-  <div className='pixelated-welcome'>
+export const Welcome = ({ t }) => (
+  <div className='welcome'>
     <img className='welcome-logo' src='/public/images/welcome.svg' alt={t('login.welcome-image-alt')} />
     <div>
       <h3>{t('login.welcome-message')}</h3>
@@ -29,8 +29,8 @@ export const PixelatedWelcome = ({ t }) => (
   </div>
 );
 
-PixelatedWelcome.propTypes = {
+Welcome.propTypes = {
   t: React.PropTypes.func.isRequired
 };
 
-export default translate('', { wait: true })(PixelatedWelcome);
+export default translate('', { wait: true })(Welcome);
diff --git a/web-ui/src/login/about/pixelated-welcome.scss b/web-ui/src/login/about/welcome.scss
index 17d05f13..1492b154 100644
--- a/web-ui/src/login/about/pixelated-welcome.scss
+++ b/web-ui/src/login/about/welcome.scss
@@ -17,12 +17,12 @@
 
 @import "~scss/base/colors";
 
-.pixelated-welcome {
+.welcome {
   display: none;
 }
 
 @media only screen and (min-width : 960px) {
-  .pixelated-welcome {
+  .welcome {
     font-size: 0.9em;
     color: $medium_grey;
     display: flex;
diff --git a/web-ui/src/login/about/welcome.spec.js b/web-ui/src/login/about/welcome.spec.js
new file mode 100644
index 00000000..3e190c0c
--- /dev/null
+++ b/web-ui/src/login/about/welcome.spec.js
@@ -0,0 +1,17 @@
+import { shallow } from 'enzyme';
+import expect from 'expect';
+import React from 'react';
+import { Welcome } from 'src/login/about/welcome';
+
+describe('Welcome', () => {
+  let welcome;
+  const mockTranslations = key => key;
+
+  beforeEach(() => {
+    welcome = shallow(<Welcome t={mockTranslations} />);
+  });
+
+  it('renders welcome component', () => {
+    expect(welcome.find('.welcome').length).toEqual(1);
+  });
+});
diff --git a/web-ui/src/login/error/auth_error.js b/web-ui/src/login/error/auth_error.js
index ceeaf42b..5dbbc3e7 100644
--- a/web-ui/src/login/error/auth_error.js
+++ b/web-ui/src/login/error/auth_error.js
@@ -18,7 +18,7 @@
 import React from 'react';
 import { translate } from 'react-i18next';
 
-import './auth-error.scss';
+import './auth_error.scss';
 
 export const AuthError = ({ t }) => (
   <p className='auth-error'>{t('error.auth')}</p>
diff --git a/web-ui/src/login/error/auth-error.scss b/web-ui/src/login/error/auth_error.scss
index f6256be4..f6256be4 100644
--- a/web-ui/src/login/error/auth-error.scss
+++ b/web-ui/src/login/error/auth_error.scss
diff --git a/web-ui/test/unit/login/error/auth_error.spec.js b/web-ui/src/login/error/auth_error.spec.js
index 55d8920f..55d8920f 100644
--- a/web-ui/test/unit/login/error/auth_error.spec.js
+++ b/web-ui/src/login/error/auth_error.spec.js
diff --git a/web-ui/src/login/error/generic_error.js b/web-ui/src/login/error/generic_error.js
index 023e1bcf..b233d5bb 100644
--- a/web-ui/src/login/error/generic_error.js
+++ b/web-ui/src/login/error/generic_error.js
@@ -18,7 +18,7 @@
 import React from 'react';
 import { translate } from 'react-i18next';
 
-import './generic-error.scss';
+import './generic_error.scss';
 
 export const GenericError = ({ t }) => (
   <div className='generic-error'>
diff --git a/web-ui/src/login/error/generic-error.scss b/web-ui/src/login/error/generic_error.scss
index 5a077f32..5a077f32 100644
--- a/web-ui/src/login/error/generic-error.scss
+++ b/web-ui/src/login/error/generic_error.scss
diff --git a/web-ui/test/unit/login/error/generic_error.spec.js b/web-ui/src/login/error/generic_error.spec.js
index 1ef8349d..1ef8349d 100644
--- a/web-ui/test/unit/login/error/generic_error.spec.js
+++ b/web-ui/src/login/error/generic_error.spec.js
diff --git a/web-ui/src/login/login.js b/web-ui/src/login/login.js
index c8e08762..39500b9d 100644
--- a/web-ui/src/login/login.js
+++ b/web-ui/src/login/login.js
@@ -19,9 +19,9 @@ import React from 'react';
 import { render } from 'react-dom';
 import a11y from 'react-a11y';
 
+import { hasQueryParameter } from 'src/common/util';
 import App from 'src/common/app';
 import PageWrapper from './page';
-import { hasQueryParameter } from '../util';
 
 if (process.env.NODE_ENV === 'development') a11y(React);
 
diff --git a/web-ui/src/login/page.js b/web-ui/src/login/page.js
index f0a7188b..6be240b2 100644
--- a/web-ui/src/login/page.js
+++ b/web-ui/src/login/page.js
@@ -21,7 +21,7 @@ import InputField from 'src/common/input_field/input_field';
 import SubmitButton from 'src/common/submit_button/submit_button';
 import AuthError from 'src/login/error/auth_error';
 import GenericError from 'src/login/error/generic_error';
-import PixelatedWelcome from 'src/login/about/pixelated_welcome';
+import Welcome from 'src/login/about/welcome';
 
 import './page.scss';
 
@@ -32,7 +32,7 @@ const errorMessage = (t, authError) => {
 
 const rightPanel = (t, error) => {
   if (error) return <GenericError />;
-  return <PixelatedWelcome />;
+  return <Welcome />;
 };
 
 export const Page = ({ t, authError, error }) => (
diff --git a/web-ui/test/unit/login/page.spec.js b/web-ui/src/login/page.spec.js
index b4063222..05607ecb 100644
--- a/web-ui/test/unit/login/page.spec.js
+++ b/web-ui/src/login/page.spec.js
@@ -4,9 +4,9 @@ import React from 'react';
 import { Page } from 'src/login/page';
 import AuthError from 'src/login/error/auth_error';
 import GenericError from 'src/login/error/generic_error';
-import PixelatedWelcome from 'src/login/about/pixelated_welcome';
+import Welcome from 'src/login/about/welcome';
 
-describe('Page', () => {
+describe('Login', () => {
   let page;
   const mockTranslations = key => key;
 
@@ -17,7 +17,7 @@ describe('Page', () => {
 
   it('renders welcome message when no error', () => {
     page = shallow(<Page t={mockTranslations} />);
-    expect(page.find(PixelatedWelcome).length).toEqual(1);
+    expect(page.find(Welcome).length).toEqual(1);
   });
 
   it('renders auth error message', () => {
@@ -32,7 +32,7 @@ describe('Page', () => {
 
   it('does not render welcome message when error', () => {
     page = shallow(<Page t={mockTranslations} error />);
-    expect(page.find(PixelatedWelcome).length).toEqual(0);
+    expect(page.find(Welcome).length).toEqual(0);
   });
 
   it('does not render error message', () => {
diff --git a/web-ui/test/unit/login/about/pixelated_welcome.spec.js b/web-ui/test/unit/login/about/pixelated_welcome.spec.js
deleted file mode 100644
index d03cb457..00000000
--- a/web-ui/test/unit/login/about/pixelated_welcome.spec.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { shallow } from 'enzyme';
-import expect from 'expect';
-import React from 'react';
-import { PixelatedWelcome } from 'src/login/about/pixelated_welcome';
-
-describe('PixelatedWelcome', () => {
-  let pixelatedWelcome;
-  const mockTranslations = key => key;
-
-  beforeEach(() => {
-    pixelatedWelcome = shallow(<PixelatedWelcome t={mockTranslations} />);
-  });
-
-  it('renders welcome component', () => {
-    expect(pixelatedWelcome.find('.pixelated-welcome').length).toEqual(1);
-  });
-});