summaryrefslogtreecommitdiff
path: root/web-ui
diff options
context:
space:
mode:
authorAnike Arni <aarni@thoughtworks.com>2017-02-23 17:34:56 -0300
committerAnike Arni <aarni@thoughtworks.com>2017-02-23 17:34:56 -0300
commitde14bb0376d5b0ed511e52251a7c0e6cc38c39eb (patch)
tree061968163c5db0e4a30e297ee31b14044d19f61c /web-ui
parentdb8ded2876a981b259f2ccfc5b07133e6eec666b (diff)
[#907] Renames welcome component
with @thaissiqueira
Diffstat (limited to 'web-ui')
-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/page.js4
-rw-r--r--web-ui/test/unit/login/about/pixelated_welcome.spec.js17
-rw-r--r--web-ui/test/unit/login/about/welcome.spec.js17
-rw-r--r--web-ui/test/unit/login/page.spec.js6
6 files changed, 29 insertions, 29 deletions
diff --git a/web-ui/src/login/about/pixelated_welcome.js b/web-ui/src/login/about/welcome.js
index 7437ab72..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/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/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);
- });
-});
diff --git a/web-ui/test/unit/login/about/welcome.spec.js b/web-ui/test/unit/login/about/welcome.spec.js
new file mode 100644
index 00000000..3e190c0c
--- /dev/null
+++ b/web-ui/test/unit/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/test/unit/login/page.spec.js b/web-ui/test/unit/login/page.spec.js
index b4063222..0fe6f729 100644
--- a/web-ui/test/unit/login/page.spec.js
+++ b/web-ui/test/unit/login/page.spec.js
@@ -4,7 +4,7 @@ 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', () => {
let page;
@@ -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', () => {