From 0683dfacf4c310818ba3d831561cd4cbb47e3b78 Mon Sep 17 00:00:00 2001
From: Johan Girod <johan.girod@beta.gouv.fr>
Date: Thu, 18 Apr 2019 17:42:56 +0200
Subject: [PATCH] =?UTF-8?q?:green=5Fheart:=20enl=C3=A8ve=20l'enregistremen?=
 =?UTF-8?q?t=20cypress=20tant=20que=20nous=20n'avons=20pas=20le=20plan=20o?=
 =?UTF-8?q?pen-source?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 circle.yml                                          |  2 +-
 source/components/Banner.css                        | 13 -------------
 source/components/Banner.js                         | 12 +++++++-----
 source/server.js                                    |  2 +-
 .../mon-entreprise.fr/layout/Footer/Integration.js  |  2 +-
 .../mon-entreprise.fr/pages/Dev/IntegrationTest.js  |  8 ++------
 source/webpack.common.js                            |  2 +-
 source/webpack.prod.js                              |  2 +-
 8 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/circle.yml b/circle.yml
index a9ab5e674..43aa3bea5 100644
--- a/circle.yml
+++ b/circle.yml
@@ -27,7 +27,7 @@ commands:
         type: string
         default: https://mon-entreprise.fr
     steps:
-      - run: CYPRESS_baseUrl=<< parameters.base_url >> yarn run cypress run --record --key 21660df5-36a5-4c49-b23d-801799b0c759 --env language=<< parameters.language >> --config integrationFolder=cypress/integration/<< parameters.integration_folder >>
+      - run: CYPRESS_baseUrl=<< parameters.base_url >> yarn run cypress run --key 21660df5-36a5-4c49-b23d-801799b0c759 --env language=<< parameters.language >> --config integrationFolder=cypress/integration/<< parameters.integration_folder >>
 
 jobs:
   unit-test:
diff --git a/source/components/Banner.css b/source/components/Banner.css
index e0f449690..59007bf86 100644
--- a/source/components/Banner.css
+++ b/source/components/Banner.css
@@ -6,7 +6,6 @@
 	color: var(--lighterInverseTextColour);
 	width: 45rem;
 	justify-content: center;
-	animation: fade-in 1s;
 }
 
 .ui__.banner img {
@@ -14,15 +13,3 @@
 	font-size: 2rem;
 	margin-bottom: 0.6rem !important;
 }
-
-@keyframes fade-in {
-	from {
-		opacity: 0;
-	}
-	50% {
-		opacity: 0;
-	}
-	to {
-		opacity: 1;
-	}
-}
diff --git a/source/components/Banner.js b/source/components/Banner.js
index 0bd3224db..d3f7c9ab6 100644
--- a/source/components/Banner.js
+++ b/source/components/Banner.js
@@ -3,10 +3,10 @@
 import React from 'react'
 import emoji from 'react-easy-emoji'
 import { connect } from 'react-redux'
+import Animate from 'Ui/animate'
 import './Banner.css'
 import type { Node } from 'react'
 import type { State } from 'Types/State'
-
 type PropTypes = {
 	hidden: boolean,
 	children: Node,
@@ -15,10 +15,12 @@ type PropTypes = {
 
 let Banner = ({ hidden = false, children, icon }: PropTypes) =>
 	!hidden ? (
-		<div className="ui__ banner">
-			{icon && emoji(icon)}
-			<p>{children}</p>
-		</div>
+		<Animate.fadeIn>
+			<div className="ui__ banner">
+				{icon && emoji(icon)}
+				<p>{children}</p>
+			</div>
+		</Animate.fadeIn>
 	) : null
 
 export default (connect(
diff --git a/source/server.js b/source/server.js
index 9a8c61f95..af689d7d1 100644
--- a/source/server.js
+++ b/source/server.js
@@ -14,7 +14,7 @@ const rewrite = basename => ({
 
 app.use(
 	history({
-		rewrites: ['embauche', 'infrance', 'mon-entreprise'].map(rewrite)
+		rewrites: ['infrance', 'mon-entreprise'].map(rewrite)
 	})
 )
 
diff --git a/source/sites/mon-entreprise.fr/layout/Footer/Integration.js b/source/sites/mon-entreprise.fr/layout/Footer/Integration.js
index ae141264a..b32e2ddf9 100644
--- a/source/sites/mon-entreprise.fr/layout/Footer/Integration.js
+++ b/source/sites/mon-entreprise.fr/layout/Footer/Integration.js
@@ -28,7 +28,7 @@ export default function Integration() {
 								</em>
 								="script-simulateur-embauche" <em>data-couleur</em>="
 								<span id="scriptColor">#2975D1</span>" <em>src</em>
-								="https://embauche.beta.gouv.fr/dist/simulateur.js">
+								="https://mon-entreprise.fr/simulateur-iframe-integration.js">
 								<span>{'<'}</span>
 								<span>/</span>
 								<em>script</em>
diff --git a/source/sites/mon-entreprise.fr/pages/Dev/IntegrationTest.js b/source/sites/mon-entreprise.fr/pages/Dev/IntegrationTest.js
index 3e318529e..1f74ef51b 100644
--- a/source/sites/mon-entreprise.fr/pages/Dev/IntegrationTest.js
+++ b/source/sites/mon-entreprise.fr/pages/Dev/IntegrationTest.js
@@ -6,13 +6,9 @@ export default withRouter(
 		componentDidMount() {
 			const script = document.createElement('script')
 			script.id = 'script-simulateur-embauche'
-			script['data-couleur'] = script.src =
-				window.location.origin + '/dist/simulateur.js'
+			script.src =
+				window.location.origin + '/simulateur-iframe-integration.js'
 			script.dataset.couleur = '#2975D1'
-			script.dataset.iframeUrl =
-				window.location.origin +
-				this.props.history.createHref({}) +
-				'iframes/simulateur-embauche'
 			this.DOMNode.appendChild(script)
 		}
 		render() {
diff --git a/source/webpack.common.js b/source/webpack.common.js
index 43786ecde..306adcda3 100644
--- a/source/webpack.common.js
+++ b/source/webpack.common.js
@@ -21,7 +21,7 @@ module.exports = {
 	entry: {
 		'mon-entreprise': './source/sites/mon-entreprise.fr/entry.fr.js',
 		infrance: './source/sites/mon-entreprise.fr/entry.en.js',
-		'simulateur-iframe-integration-script':
+		'simulateur-iframe-integration':
 			'./source/sites/mon-entreprise.fr/iframe-integration-script.js'
 	},
 	output: {
diff --git a/source/webpack.prod.js b/source/webpack.prod.js
index 468d00e7e..25678743b 100644
--- a/source/webpack.prod.js
+++ b/source/webpack.prod.js
@@ -48,7 +48,7 @@ module.exports = {
 	output: {
 		...common.output,
 		filename: ({ chunk }) => {
-			return chunk.name === 'dist/simulateur'
+			return chunk.name === 'simulateur-iframe-integration'
 				? '[name].js'
 				: '[name].[contenthash].bundle.js'
 		}