summaryrefslogtreecommitdiff
path: root/web-ui/src/login/about
diff options
context:
space:
mode:
authorTulio Casagrande <tuliocasagrande@gmail.com>2017-02-24 15:53:06 -0300
committerGitHub <noreply@github.com>2017-02-24 15:53:06 -0300
commitf783cbba382433c122e19a7231ebe17cc1ae7e5b (patch)
tree0f29f48029cdbc6bb53aa80ea6fa8862732b7459 /web-ui/src/login/about
parentd77d9c41e5a5b791cf54082f0f1ae83699f0bc95 (diff)
parentef173d95b22154ee72c685cd6d5b04e9473dc988 (diff)
Merge pull request #993 from pixelated/login-errors
Login errors - some refactorings
Diffstat (limited to 'web-ui/src/login/about')
-rw-r--r--web-ui/src/login/about/welcome.js (renamed from web-ui/src/login/about/pixelated_welcome.js)10
-rw-r--r--web-ui/src/login/about/welcome.scss (renamed from web-ui/src/login/about/pixelated-welcome.scss)4
-rw-r--r--web-ui/src/login/about/welcome.spec.js17
3 files changed, 24 insertions, 7 deletions
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);
+ });
+});