Merge pull request #987 from pixelated/login-errors

Adds welcome and error messages to login

5 files changed, 86 insertions, 8 deletions

diff --git a/web-ui/test/unit/login/about/pixelated_welcome.spec.js b/web-ui/test/unit/login/about/pixelated_welcome.spec.js
new file mode 100644
index 00000000..d03cb457
--- /dev/null
+++ b/web-ui/test/unit/login/about/pixelated_welcome.spec.js
@@ -0,0 +1,17 @@
+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);
+  });
+});
diff --git a/web-ui/test/unit/login/app.spec.js b/web-ui/test/unit/login/app.spec.js
index 347e2b19..39d21f04 100644
--- a/web-ui/test/unit/login/app.spec.js
+++ b/web-ui/test/unit/login/app.spec.js
@@ -2,25 +2,52 @@ import { shallow } from 'enzyme';
 import expect from 'expect';
 import React from 'react';
 import { App } from 'src/login/app';
+import AuthError from 'src/login/error/auth_error';
+import GenericError from 'src/login/error/generic_error';
+import PixelatedWelcome from 'src/login/about/pixelated_welcome';
 
 describe('App', () => {
   let app;
   const mockTranslations = key => key;
 
-  beforeEach(() => {
+  it('renders login form', () => {
     app = shallow(<App t={mockTranslations} />);
+    expect(app.find('form').props().action).toEqual('/login');
   });
 
-  it('renders login form', () => {
-    expect(app.find('form').props().action).toEqual('/login');
+  it('renders welcome message when no error', () => {
+    app = shallow(<App t={mockTranslations} />);
+    expect(app.find(PixelatedWelcome).length).toEqual(1);
   });
 
   it('renders auth error message', () => {
     app = shallow(<App t={mockTranslations} authError />);
-    expect(app.find('.error').length).toEqual(1);
+    expect(app.find(AuthError).length).toEqual(1);
+  });
+
+  it('renders generic error message when error', () => {
+    app = shallow(<App t={mockTranslations} error />);
+    expect(app.find(GenericError).length).toEqual(1);
   });
 
-  it('does not render auth error message', () => {
-    expect(app.find('.error').length).toEqual(0);
+  it('does not render welcome message when error', () => {
+    app = shallow(<App t={mockTranslations} error />);
+    expect(app.find(PixelatedWelcome).length).toEqual(0);
+  });
+
+  it('does not render error message', () => {
+    app = shallow(<App t={mockTranslations} />);
+    expect(app.find(AuthError).length).toEqual(0);
+    expect(app.find(GenericError).length).toEqual(0);
+  });
+
+  it('adds small logo class when error', () => {
+    app = shallow(<App t={mockTranslations} error />);
+    expect(app.find('.logo').props().className).toEqual('logo small-logo');
+  });
+
+  it('does not add small logo class when no error', () => {
+    app = shallow(<App t={mockTranslations} />);
+    expect(app.find('.logo').props().className).toEqual('logo');
   });
 });
diff --git a/web-ui/test/unit/login/error/auth_error.spec.js b/web-ui/test/unit/login/error/auth_error.spec.js
new file mode 100644
index 00000000..55d8920f
--- /dev/null
+++ b/web-ui/test/unit/login/error/auth_error.spec.js
@@ -0,0 +1,17 @@
+import { shallow } from 'enzyme';
+import expect from 'expect';
+import React from 'react';
+import { AuthError } from 'src/login/error/auth_error';
+
+describe('AuthError', () => {
+  let authError;
+  const mockTranslations = key => key;
+
+  beforeEach(() => {
+    authError = shallow(<AuthError t={mockTranslations} />);
+  });
+
+  it('renders error message', () => {
+    expect(authError.find('.auth-error').length).toEqual(1);
+  });
+});
diff --git a/web-ui/test/unit/login/error/generic_error.spec.js b/web-ui/test/unit/login/error/generic_error.spec.js
new file mode 100644
index 00000000..1ef8349d
--- /dev/null
+++ b/web-ui/test/unit/login/error/generic_error.spec.js
@@ -0,0 +1,17 @@
+import { shallow } from 'enzyme';
+import expect from 'expect';
+import React from 'react';
+import { GenericError } from 'src/login/error/generic_error';
+
+describe('GenericError', () => {
+  let genericError;
+  const mockTranslations = key => key;
+
+  beforeEach(() => {
+    genericError = shallow(<GenericError t={mockTranslations} />);
+  });
+
+  it('renders error message', () => {
+    expect(genericError.find('.generic-error').length).toEqual(1);
+  });
+});
diff --git a/web-ui/test/unit/util.spec.js b/web-ui/test/unit/util.spec.js
index 84decf6f..968b2d83 100644
--- a/web-ui/test/unit/util.spec.js
+++ b/web-ui/test/unit/util.spec.js
@@ -5,12 +5,12 @@ describe('Utils', () => {
   describe('.hasQueryParameter', () => {
     global.window = {
       location: {
-        search: '?auth&lng=pt-BR'
+        search: '?auth-error&lng=pt-BR'
       }
     };
 
     it('checks if param included in query parameters', () => {
-      expect(Util.hasQueryParameter('auth')).toBe(true);
+      expect(Util.hasQueryParameter('auth-error')).toBe(true);
     });
 
     it('checks if param not included in query parameters', () => {