From f7bd078bcce2d6cad419fceb55ab71415cda4d33 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 21 Feb 2017 13:51:41 -0300 Subject: [#907] Display error message for mobile version with @anikarni --- web-ui/test/unit/login/app.spec.js | 20 +++++++++++++------- web-ui/test/unit/login/error/auth_error.spec.js | 17 +++++++++++++++++ web-ui/test/unit/login/error/generic_error.spec.js | 17 +++++++++++++++++ web-ui/test/unit/util.spec.js | 4 ++-- 4 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 web-ui/test/unit/login/error/auth_error.spec.js create mode 100644 web-ui/test/unit/login/error/generic_error.spec.js (limited to 'web-ui/test/unit') diff --git a/web-ui/test/unit/login/app.spec.js b/web-ui/test/unit/login/app.spec.js index 347e2b19..c1d63235 100644 --- a/web-ui/test/unit/login/app.spec.js +++ b/web-ui/test/unit/login/app.spec.js @@ -2,25 +2,31 @@ 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'; describe('App', () => { let app; const mockTranslations = key => key; - beforeEach(() => { - app = shallow(); - }); - it('renders login form', () => { + app = shallow(); expect(app.find('form').props().action).toEqual('/login'); }); it('renders auth error message', () => { app = shallow(); - expect(app.find('.error').length).toEqual(1); + expect(app.find(AuthError).length).toEqual(1); }); - it('does not render auth error message', () => { - expect(app.find('.error').length).toEqual(0); + it('renders generic error message', () => { + app = shallow(); + expect(app.find(GenericError).length).toEqual(1); + }); + + it('does not render error message', () => { + app = shallow(); + expect(app.find(AuthError).length).toEqual(0); + expect(app.find(GenericError).length).toEqual(0); }); }); 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(); + }); + + 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(); + }); + + 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', () => { -- cgit v1.2.3 From 38c73f2e67173d5358dd4bb7e17b1e5b9c283f22 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 22 Feb 2017 10:52:52 -0300 Subject: [#907] Add pixelated welcome message to login with @tuliocasagrande and @thaissiqueira --- web-ui/test/unit/login/app.spec.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'web-ui/test/unit') diff --git a/web-ui/test/unit/login/app.spec.js b/web-ui/test/unit/login/app.spec.js index c1d63235..e329af0f 100644 --- a/web-ui/test/unit/login/app.spec.js +++ b/web-ui/test/unit/login/app.spec.js @@ -4,6 +4,7 @@ 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; @@ -14,16 +15,26 @@ describe('App', () => { expect(app.find('form').props().action).toEqual('/login'); }); + it('renders welcome message when no error', () => { + app = shallow(); + expect(app.find(PixelatedWelcome).length).toEqual(1); + }); + it('renders auth error message', () => { app = shallow(); expect(app.find(AuthError).length).toEqual(1); }); - it('renders generic error message', () => { + it('renders generic error message when error', () => { app = shallow(); expect(app.find(GenericError).length).toEqual(1); }); + it('does not render welcome message when error', () => { + app = shallow(); + expect(app.find(PixelatedWelcome).length).toEqual(0); + }); + it('does not render error message', () => { app = shallow(); expect(app.find(AuthError).length).toEqual(0); -- cgit v1.2.3 From d4551f07c44d67231e7cbd841817ff2e7c276932 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 22 Feb 2017 14:54:28 -0300 Subject: [#907] Adds unit test for PixelatedWelcome component with @thaissiqueira --- web-ui/test/unit/login/about/pixelated_welcome.spec.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 web-ui/test/unit/login/about/pixelated_welcome.spec.js (limited to 'web-ui/test/unit') 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(); + }); + + it('renders welcome component', () => { + expect(pixelatedWelcome.find('.pixelated-welcome').length).toEqual(1); + }); +}); -- cgit v1.2.3 From ee20eb582e2edaac5b4ce3a6a7de51cd35a4a154 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 22 Feb 2017 15:21:18 -0300 Subject: [#907] Makes logo smaller on mobile generic error with @SweetVirginia --- web-ui/test/unit/login/app.spec.js | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'web-ui/test/unit') diff --git a/web-ui/test/unit/login/app.spec.js b/web-ui/test/unit/login/app.spec.js index e329af0f..2036dfd7 100644 --- a/web-ui/test/unit/login/app.spec.js +++ b/web-ui/test/unit/login/app.spec.js @@ -40,4 +40,15 @@ describe('App', () => { expect(app.find(AuthError).length).toEqual(0); expect(app.find(GenericError).length).toEqual(0); }); + + it('adds small logo class when error', () => { + app = shallow(); + expect(app.find('.logo').props().className).toEqual('logo small-logo'); + }); + + it('does not add small logo class when no error', () => { + app = shallow(); + expect(app.find('.logo').props().className).toEqual('logo'); + }); + }); -- cgit v1.2.3 From 55cae8e71afec52e31401c512b8bebbb1e5ca88d Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 22 Feb 2017 17:50:09 -0300 Subject: [#907] Fix lint with @thaissiqueira --- web-ui/test/unit/login/app.spec.js | 1 - 1 file changed, 1 deletion(-) (limited to 'web-ui/test/unit') diff --git a/web-ui/test/unit/login/app.spec.js b/web-ui/test/unit/login/app.spec.js index 2036dfd7..39d21f04 100644 --- a/web-ui/test/unit/login/app.spec.js +++ b/web-ui/test/unit/login/app.spec.js @@ -50,5 +50,4 @@ describe('App', () => { app = shallow(); expect(app.find('.logo').props().className).toEqual('logo'); }); - }); -- cgit v1.2.3