From 7c261511e0107322a37921f9ac8effebc8797fbb Mon Sep 17 00:00:00 2001
From: Juri Strumpflohner <juri.strumpflohner@gmail.com>
Date: Thu, 29 Jul 2021 16:29:03 +0200
Subject: [PATCH] fix(react): align component and e2e test generation (#6535)

---
 .../component-cypress-spec/component-cypress-spec.spec.ts   | 6 +++---
 .../files/__componentName__.spec.__fileExt__                | 2 +-
 .../src/generators/component/files/__fileName__.tsx__tmpl__ | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/react/src/generators/component-cypress-spec/component-cypress-spec.spec.ts b/packages/react/src/generators/component-cypress-spec/component-cypress-spec.spec.ts
index 2c17aeded4b5f..27f6c42dc79f8 100644
--- a/packages/react/src/generators/component-cypress-spec/component-cypress-spec.spec.ts
+++ b/packages/react/src/generators/component-cypress-spec/component-cypress-spec.spec.ts
@@ -108,9 +108,9 @@ describe('react:component-cypress-spec', () => {
         beforeEach(() => cy.visit('/iframe.html?id=test--primary&args=name;displayAge:false;'));
         
         it('should render the component', () => {
-          cy.get('h1').should('contain', 'Welcome to test-ui-lib!');
+          cy.get('h1').should('contain', 'Welcome to Test!');
         });
-      });
+      })
       `);
           });
         });
@@ -135,7 +135,7 @@ describe('react:component-cypress-spec', () => {
       beforeEach(() => cy.visit('/iframe.html?id=test--primary'));
       
       it('should render the component', () => {
-        cy.get('h1').should('contain', 'Welcome to test-ui-lib!');
+        cy.get('h1').should('contain', 'Welcome to Test!');
       });
     });
     `);
diff --git a/packages/react/src/generators/component-cypress-spec/files/__componentName__.spec.__fileExt__ b/packages/react/src/generators/component-cypress-spec/files/__componentName__.spec.__fileExt__
index dd4a6a0e761e0..eae23f1c66271 100644
--- a/packages/react/src/generators/component-cypress-spec/files/__componentName__.spec.__fileExt__
+++ b/packages/react/src/generators/component-cypress-spec/files/__componentName__.spec.__fileExt__
@@ -8,6 +8,6 @@ describe('<%=projectName%>: <%= componentSelector %> component', () => {
     }%>'));
     
     it('should render the component', () => {
-      cy.get('h1').should('contain', 'Welcome to <%=projectName%>!');
+      cy.get('h1').should('contain', 'Welcome to <%=componentSelector%>!');
     });
 });
diff --git a/packages/react/src/generators/component/files/__fileName__.tsx__tmpl__ b/packages/react/src/generators/component/files/__fileName__.tsx__tmpl__
index 722166838e559..0b2b3b519eff8 100644
--- a/packages/react/src/generators/component/files/__fileName__.tsx__tmpl__
+++ b/packages/react/src/generators/component/files/__fileName__.tsx__tmpl__
@@ -33,7 +33,7 @@ export class <%= className %> extends Component<<%= className %>Props> {
     return (
       <<%= wrapper %>>
         <%= styledModule === 'styled-jsx' ? `<style jsx>{\`div { color: pink; }\`}</style>` : `` %>
-        <p>Welcome to <%= name %>!</p>
+        <p>Welcome to <%= className %>!</p>
         <% if (routing) { %>
           <ul>
             <li><Link to="/"><%= name %> root</Link></li>
@@ -49,7 +49,7 @@ export function <%= className %>(props: <%= className %>Props) {
   return (
     <<%= wrapper %>>
       <% if (styledModule === 'styled-jsx') { %><style jsx>{`div { color: pink; }`}</style><% } %>
-      <h1>Welcome to <%= name %>!</h1>
+      <h1>Welcome to <%= className %>!</h1>
       <% if (routing) { %>
         <ul>
           <li><Link to="/"><%= name %> root</Link></li>