Merge pull request #280 from nickhealy/expandSpectrontests

Expand spectrontests

Author: StephWood

src/client/components/composer/NewRequest/CookieEntryForm.jsx

@@ -88,11 +88,19 @@ class CookieEntryForm extends Component {
 
   render() {
     let cookiesArr = this.props.newRequestCookies.cookiesArr.map((cookie, index) => {
-      return (<Header content={cookie} changeHandler={this.onChangeUpdateCookie} key={index} Key={cookie.key} value={cookie.value}></Header>)
+      return (
+        <Header 
+          type='cookie' 
+          content={cookie} 
+          changeHandler={this.onChangeUpdateCookie} 
+          key={index} Key={cookie.key} 
+          value={cookie.value}>
+        </Header>
+        )
     });
 
     const arrowClass = this.state.show ? 'composer_subtitle_arrow-open' : 'composer_subtitle_arrow-closed';
-    const cookiesContainerClass = this.state.show ? 'composer_headers_container-open' : 'composer_headers_container-closed'
+    const cookiesContainerClass = this.state.show ? 'composer_headers_container-open cookies_container' : 'composer_headers_container-closed cookies_container'
 
     return (
       <div>

src/client/components/composer/NewRequest/Header.jsx

@@ -2,26 +2,26 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 const Header = ({
-  content, changeHandler, Key, value,
+  type, content, changeHandler, Key, value,
 }) => (
-  <div style={styles} className='composer_header'>
+  <div style={styles} className={`composer_header ${type === 'header' ? 'header_container' : 'cookie_container'}`}>
     <input
-      className='composer_header_checkbox'
+      className={`composer_header_checkbox ${type === 'header' ? 'header_checkbox' : 'cookie_checkbox'}`}
       type="checkbox"
       checked={content.active}
       onChange={e => changeHandler(content.id, 'active', e.target.checked)}
     />
 
     <input
-      className="composer_header_input composer_header_input_first"
+      className={`composer_header_input composer_header_input_first ${type === 'header' ? 'header_key' : 'cookie_key'}`}
       type="text"
       placeholder="Key"
       value={Key}
       onChange={e => changeHandler(content.id, 'key', e.target.value)}
     />
 
     <input
-      className="composer_header_input"
+      className={`composer_header_input ${type === 'header' ? 'header_value' : 'cookie_value'}`}
       type="text"
       placeholder="Value"
       value={value}

src/client/components/composer/NewRequest/HeaderEntryForm.jsx

@@ -157,6 +157,7 @@ class HeaderEntryForm extends Component {
 
     const headersArr = this.props.newRequestHeaders.headersArr.map((header, index) => (
       <Header
+        type='header'
         content={header}
         changeHandler={this.onChangeUpdateHeader}
         key={index} //key

test/pageObjects/Sidebar.js

@@ -2,6 +2,7 @@ const app = require('../testApp.js');
 
 class Sidebar {
 
+  // URL/METHOD INPUTS
   get url() { 
     return app.client.$('input.composer_url_input');
   };
@@ -18,12 +19,52 @@ class Sidebar {
     return app.client.$('option=GET');
   };
 
+  // BODY INPUTS
+  get activateBodyInput(){
+    return app.client.$('.composer_subtitle=Body');
+  };
+
+  get rawBtn(){
+    return app.client.$('.composer_bodytype_button=Raw');
+  };
+
+  get urlencodedBtn(){
+    return app.client.$('.composer_bodytype_button=x-www-form-urlencoded');
+  };
+
+  get noneBtn(){
+    return app.client.$('.composer_bodytype_button=None');
+  };
+
+  get contentTypeBtn(){
+    return app.client.$('select.composer_rawtype_select');
+  };
+
+  get chooseJSON(){
+    return app.client.$('option=JSON (application/json)');
+  };
+
+  get bodyInput(){
+    return app.client.$('textarea.composer_textarea');
+  };
+
+
+  get prettyJSON(){
+    return app.client.$('.composer_pretty_print');
+  };
+  
+  // HEADER INPUTS
+
   get activateHeaders(){
     return app.client.$('.composer_subtitle=Headers'); 
   };
 
-  get headerCheckbox(){
-    return app.client.$$('header_checkbox');
+  get headers(){
+    return app.client.$$('.header_container');
+  }
+
+  get firstHeaderCheckbox(){
+    return app.client.$('.header_checkbox')
   };
 
   get headerKey(){
@@ -32,6 +73,36 @@ class Sidebar {
 
   get headerValue(){
     return app.client.$('.header_value'); 
+  };
+
+  get addHeader(){
+    return app.client.$('button=Add Header');
+  };
+
+  // COOKIE INPUTS
+  get cookies(){
+    return app.client.$$('.cookie_container');
+  };
+
+  get activateCookies(){
+    return app.client.$('.composer_subtitle=Cookies');
+  }
+
+  get firstCookieCheckbox(){
+    return app.client.$('.cookie_checkbox');
+  };
+
+  get cookieKey(){
+    return app.client.$('.cookie_key');
+  };
+
+  get cookieValue(){
+    return app.client.$('.cookie_value');
+  };
+
+  // ADD REQUEST BUTTON
+  get addRequestBtn(){
+    return app.client.$('button=Add New Request')
   }
 }; 
 

test/subSuites/addRequestTests.js

@@ -0,0 +1,64 @@
+const assert = require('assert'); 
+const sideBar = require('../pageObjects/Sidebar.js'); 
+const app = require('../testApp');
+const fs = require('fs');
+const path = require('path');
+
+
+module.exports = () => {
+  describe('Add New Request Button', () => {
+    let value; 
+    let headers;
+    let isChecked;
+    let cookies;
+    
+    
+    describe('inputs reset when new request button is clicked', () => {
+      
+      before(async function() {
+        await sideBar.addRequestBtn.click();
+      })
+      
+      it('url input resets', async () => {
+        value = await sideBar.url.getValue(); 
+        assert.strictEqual(value, 'http://');
+      });
+
+      it('custom headers disappear', async () => {
+        await sideBar.activateHeaders.click();
+        headers = await sideBar.headers;
+        assert.strictEqual(headers.length, 1);
+      });
+      
+      it('header inputs reset', async () => {
+        value = await sideBar.headerKey.getValue();
+        assert.strictEqual(value, ''); 
+        value = await sideBar.headerValue.getValue();
+        assert.strictEqual(value, '');
+        isChecked = await sideBar.firstHeaderCheckbox.isSelected();
+        assert.strictEqual(isChecked, false); 
+      });
+
+      it('custom cookies disappear', async () => {
+        await sideBar.activateCookies.click();
+        cookies = await sideBar.cookies;
+        assert.strictEqual(cookies.length, 1);
+      });
+
+      it('cookie fields reset', async () => {
+        value = await sideBar.cookieKey.getValue();
+        assert.strictEqual(value, ''); 
+        value = await sideBar.cookieValue.getValue();
+        assert.strictEqual(value, '');
+        isChecked = await sideBar.firstCookieCheckbox.isSelected();
+        assert.strictEqual(isChecked, false); 
+      });
+
+      it("take a snapshot of app", async () => {
+        const imageBuffer = await app.browserWindow.capturePage();
+        fs.writeFileSync(path.resolve(__dirname, "addedReq.png"), imageBuffer);
+      });
+      
+    })
+  })
+}