Merge pull request #27 from oslabs-beta/staging

taoantaoan · web-flow · commit 934e6ffda879 · 2021-03-24T11:24:58.000-07:00
Merge Staging to Main
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Spearmint",
-  "version": "0.1.0",
+  "version": "2.0.0",
   "description": "Spearmint",
   "author": "spearmintjs",
   "build": {
@@ -46,6 +46,8 @@
     "react-start": "react-scripts start",
     "react-build": "NODE_ENV=production react-scripts build",
     "test": "react-scripts test --env=jsdom",
+    "test:e2e": "./node_modules/mocha/bin/mocha src/__tests__/spec.e2e.js",
+    "test:integra": "mocha src/__tests__/spec.integra.js",
     "test:watch": "jest --watch",
     "react-eject": "react-scripts eject",
     "electron-build": "NODE_ENV=production electron-builder -mwl",
@@ -74,6 +76,8 @@
     "@types/jest": "^25.2.3",
     "@typescript-eslint/eslint-plugin": "^2.33.0",
     "@typescript-eslint/parser": "^2.33.0",
+    "chai": "^4.3.4",
+    "chai-as-promised": "^7.1.1",
     "electron": "^5.0.3",
     "electron-builder": "^22.6.1",
     "electron-devtools-installer": "^3.0.0",
@@ -84,6 +88,7 @@
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-react": "^7.20.0",
     "eslint-plugin-react-hooks": "^2.5.1",
+    "mocha": "^8.3.2",
     "react-test-renderer": "^16.12.0",
     "spectron": "^5.0.0",
     "test-data-bot": "^0.8.0"
diff --git a/public/index.html b/public/index.html
@@ -20,7 +20,7 @@
         work correctly both with client-side routing and a non-root public URL.
         Learn how to configure a non-root public URL by running `npm run build`.
       -->
-    <title>spearmint</title>
+    <title>spearmint | testing, simplified</title>
   </head>
 
   <body>
@@ -42,6 +42,5 @@
         return '/monaco-editor-worker-loader-proxy.js';
       },
     };
-    // require(['vs/editor/editor.main'], function() {});
   </script>
 </html>
diff --git a/src/__tests__/spec.e2e.js b/src/__tests__/spec.e2e.js
@@ -0,0 +1,49 @@
+const Application = require('spectron').Application;
+const path = require('path');
+const chai = require('chai');
+const chaiAsPromised = require('chai-as-promised');
+
+// specifies the path of the application to launch
+const electronPath = require('electron');
+
+// tell spectron to look and use the main.js file + package.json located 2 levels above
+const appPath = path.join(__dirname, '../..');
+
+
+// instantiates the spearmint application given the optional paramaters of the Application API
+const app = new Application({
+  path: electronPath,  // string path to the Electron application executable to launch
+  args: [appPath],     // array of paths to find the executable files and package.json 
+});
+
+// define the use of chai and chai as promised packages
+global.before(function () {
+  chai.should();
+  chai.use(chaiAsPromised);
+});
+
+describe('Application Accessibility Audit', function () {
+  this.timeout(10000);
+
+  beforeEach(function () {
+    return app.start();
+  });
+
+  afterEach(function () {
+    if (app && app.isRunning()) {
+      return app.stop();
+    }
+  });
+
+  it('Audits Accessibility', function (done) {
+    app.client.auditAccessibility().then(function (audit) {
+      if (audit.failed) {
+        console.error('Please address the following accessibility issues in your application: \n', audit.results)
+      }
+      else {
+        console.log('No accessibility issues have been found.')
+      }
+      done()
+    })
+  });  
+});
diff --git a/src/__tests__/spec.integra.js b/src/__tests__/spec.integra.js
@@ -0,0 +1,41 @@
+const Application = require('spectron').Application;
+const path = require('path');
+const assert = require('assert');
+
+// specifies the path of the application to launch
+const electronPath = require('electron');
+
+// tell spectron to look and use the main.js file + package.json located 2 levels above
+const appPath = path.join(__dirname, '../..');
+
+// instantiates the spearmint application given the optional paramaters of the Application API
+const app = new Application({
+  path: electronPath,  // string path to the Electron application executable to launch
+  args: [appPath],     // array of paths to find the executable files and package.json   
+});
+
+
+describe('Application Accessibility Audit', function () {
+  this.timeout(10000);
+  
+  beforeEach(function () {
+    return app.start();
+  });
+
+  afterEach(function () {
+    if (app && app.isRunning()) {
+      return app.stop();
+    }
+  });
+
+  it('Audits Accessibility', function () {
+    return app.client.auditAccessibility().then(function (audit) {
+      if (audit.failed) {
+        console.error('Please address the following accessibility issues in your application: \n', audit.results)
+      }
+      else {
+        console.log('No accessibility issues have been found.')
+      }
+    })
+  });
+});
diff --git a/src/assets/stylesheets/colors.scss b/src/assets/stylesheets/colors.scss
@@ -1,5 +1,5 @@
-$mint: #02c2c3;
-$mint2: #69e5ce;
+$mint: #038181;
+$mint2: #02c3c33f;
 $dark-gray: #808080;
 $light-gray: #d5d5d5;
 $light-gray2: #f6f8f9;
diff --git a/src/pages/ProjectLoader/ProjectLoader.jsx b/src/pages/ProjectLoader/ProjectLoader.jsx
@@ -40,17 +40,19 @@ const ProjectLoader = () => {
       <section id={styles.upperPart}>
         <span id={styles.title}>spearmint</span>
         <svg
+          id={styles.leaf}
           viewBox='0 0 24 24'
           xmlns='http://www.w3.org/2000/svg'
           xmlnsXlink='http://www.w3.org/1999/xlink'
-          id={styles.leaf}
-        >
+          >
           <path
             fill='#ffffff'
             d='M17,8C8,10 5.9,16.17 3.82,21.34L5.71,22L6.66,19.7C7.14,19.87 7.64,20 8,20C19,20 22,3 22,3C21,5 14,5.25 9,6.25C4,7.25 2,11.5 2,13.5C2,15.5 3.75,17.25 3.75,17.25C7,8 17,8 17,8Z'
-          />
+            />
         </svg>
+        <span id={styles.purpose}>testing, simplified</span>
       </section>
+
       <section id={styles.lowerPart}>
         <div id={styles.appBox}>
           <div className={styles.contentBox}>
@@ -60,7 +62,7 @@ const ProjectLoader = () => {
           </div>
           <div className={styles.contentBox}>
             <span className={styles.number}>02</span>
-            <span className={styles.text}>Select your application</span> <br />
+            <span className={styles.text}>Select your application</span> <br/>
             <OpenFolder />
           </div>
         </div>
diff --git a/src/pages/ProjectLoader/ProjectLoader.module.scss b/src/pages/ProjectLoader/ProjectLoader.module.scss
@@ -4,10 +4,11 @@
 #upperPart {
   width: 100%;
   height: 50vh;
-  background-color: #02c2c3;
+  background-color: #038181;
   display: flex;
+  flex-direction: column;
   justify-content: center;
-  align-items: flex-end;
+  align-items: center;
 }
 
 #title {
@@ -16,7 +17,17 @@
   vertical-align: bottom;
   font-family: 'comfortaa';
   color: #fff;
-  margin-bottom: 30px;
+  padding-top: 30px;
+  margin-top: 30px;
+  flex: 1;
+}
+
+#purpose {
+  font-size: 1rem;
+  text-align: center;
+  font-family: 'comfortaa';
+  color: #fff;
+  flex: 1;
 }
 
 #leaf {
@@ -94,8 +105,6 @@
 #helpBtn {
   color: white;
   background-color: $mint;
-  // margin-right: 4px;
-  // margin-bottom: 4px;
   margin: 15px 4px 4px 4px;
   height: 40px;
   width: 110px;
diff --git a/tsconfig.json b/tsconfig.json
@@ -23,6 +23,7 @@
   "include": [
     "src",
     "src/context/__tests__",
-    "__tests__/hello.test.js"
+    "__tests__/hello.test.js",   
+    "tests/spec.integra.js"  
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`"include": [`
`24`	`24`	`"src",`
`25`	`25`	`"src/context/__tests__",`
`26`		`- "__tests__/hello.test.js"`
	`26`	`+ "__tests__/hello.test.js",`
	`27`	`+ "tests/spec.integra.js"`
`27`	`28`	`]`
`28`	`29`	`}`