updated tests

Author: mac-s-g

src/js/components/DataTypes/Function.js

@@ -43,7 +43,8 @@ export default class extends React.Component {
         return (
         <div {...Theme(props.theme, 'function')} >
             <DataTypeLabel type_name={type_name} {...props} />
-            <span onClick={()=>{this.toggleCollapsed()}} >
+            <span class="rjv-function-container"
+            onClick={()=>{this.toggleCollapsed()}} >
             {this.getFunctionDisplay(collapsed)}
             </span>
         </div>

src/js/components/ObjectKeyModal/ObjectKeyModal.js

@@ -40,7 +40,6 @@ export default class extends React.Component {
                 </div>
                 <div style={{position: 'relative'}}>
                     <input {...Theme(theme, 'key-modal-input')}
-                        id={'rjv-modal-input-' + rjvId}
                         class="key-modal-input"
                         ref={el => el && el.focus()}
                         spellCheck={false}
@@ -79,23 +78,6 @@ export default class extends React.Component {
         );
     }
 
-    componentDidMount() {
-        const {rjvId} = this.props;
-        moveCursorToEnd(
-            document.getElementById('rjv-modal-input-' + rjvId)
-        );
-        function moveCursorToEnd(el) {
-            if (typeof el.selectionStart == "number") {
-                el.selectionStart = el.selectionEnd = el.value.length;
-            } else if (typeof el.createTextRange != "undefined") {
-                el.focus();
-                var range = el.createTextRange();
-                range.collapse(false);
-                range.select();
-            }
-        }
-    }
-
     submit = () => {
         this.props.submit(this.state.input);
     }

test/tests/js/components/AddKeyRequest-test.js

@@ -79,7 +79,7 @@ describe('<JsonFunction />', function () {
 
         expect(wrapper.find('.function-collapsed')).to.have.length(1);
 
-        wrapper.simulate('click');
+        wrapper.find('.rjv-function-container').simulate('click');
 
         expect(wrapper.find('.function-collapsed')).to.have.length(0);
 

test/tests/js/components/DataTypes/Function-test.js

@@ -0,0 +1,60 @@
+import React from 'react';
+import { shallow, render, mount } from 'enzyme';
+import {expect} from 'chai';
+
+import AddKeyRequest from '/react/src/js/components/ObjectKeyModal/AddKeyRequest';
+import ObjectAttributes from '/react/src/js/stores/ObjectAttributes';
+
+
+describe('<AddKeyRequest />', function () {
+    const rjvId = 1;
+
+    it('AddKeyRequest should not render input when inactive', function () {
+        ObjectAttributes.set(
+            rjvId, 'action', 'new-key-request', {
+                existing_value: {test:true},
+                namespace: [],
+                new_value: {test: null}
+            }
+        );
+        ObjectAttributes.set(
+            rjvId, 'global', 'src', {test:true}
+        );
+        const wrapper = mount(
+            <AddKeyRequest
+            active={false}
+            theme='rjv-default'
+            rjvId={rjvId}
+            />
+        );
+
+        expect(
+            wrapper.find('.key-modal-input').length
+        ).to.equal(0);
+    });
+
+    it('AddKeyRequest should render input when active', function () {
+        ObjectAttributes.set(
+            rjvId, 'action', 'new-key-request', {
+                existing_value: {test:true},
+                namespace: [],
+                new_value: {test: null}
+            }
+        );
+        ObjectAttributes.set(
+            rjvId, 'global', 'src', {test:true}
+        );
+        const wrapper = mount(
+            <AddKeyRequest
+            active={true}
+            theme='rjv-default'
+            rjvId={rjvId}
+            />
+        );
+
+        expect(
+            wrapper.find('.key-modal-input').length
+        ).to.equal(1);
+    });
+
+});