fix tests

jeffrifwald · Jan 15, 2016 · 97ac21a · 97ac21a
1 parent cc54ad8
commit 97ac21a
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
 language: node_js
 node_js:
-    - "0.10"
+    - "4.2.4"
 sudo: false
diff --git a/package.json b/package.json
@@ -22,15 +22,15 @@
     "test": "npm run lint && npm run cover && npm run check_coverage"
   },
   "devDependencies": {
-    "babel": "^6.3.13",
-    "babel-cli": "^6.3.13",
-    "babel-core": "^6.3.13",
+    "babel": "6.3.13",
+    "babel-cli": "6.3.13",
+    "babel-core": "6.3.13",
     "babel-eslint": "^4.1.6",
     "babel-loader": "^6.2.1",
-    "babel-polyfill": "^6.3.13",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-preset-react": "^6.3.13",
-    "babel-preset-stage-1": "^6.3.13",
+    "babel-polyfill": "6.3.13",
+    "babel-preset-es2015": "6.3.13",
+    "babel-preset-react": "6.3.13",
+    "babel-preset-stage-1": "6.3.13",
     "babel-runtime": "^6.3.13",
     "css-loader": "^0.23.1",
     "eslint": "^0.23.0",

diff --git a/src/SearchBox/components/SearchBox.js b/src/SearchBox/components/SearchBox.js
@@ -163,8 +163,8 @@ class SearchBox extends React.Component {
         this.setState({value});
     }
 
-    selectIndex(index) {
-        let selectedIndex = index;
+    selectIndex(i) {
+        let selectedIndex = i;
 
         if (selectedIndex >= this.state.results.length) {
             selectedIndex = this.state.results.length - 1;

diff --git a/src/SelectBox/components/SelectBox.js b/src/SelectBox/components/SelectBox.js
@@ -14,7 +14,7 @@ class SelectBox extends React.Component {
         super(...args);
 
         this.state = {
-            highlightIndex: -1,
+            highlightedIndex: -1,
             showDropDown: false,
             value: this.props.defaultValue
         };
@@ -182,7 +182,7 @@ class SelectBox extends React.Component {
                     ''
                 ),
                 (
-                    i === this.state.highlightIndex ?
+                    i === this.state.highlightedIndex ?
                     'react-ui-select-box-option-highlighted' :
                     ''
                 )
@@ -211,7 +211,7 @@ class SelectBox extends React.Component {
         this.props.onChange(evt, option);
 
         this.setState({
-            highlightIndex: -1,
+            highlightedIndex: -1,
             showDropDown: false,
             query: '',
             value: option
@@ -267,15 +267,15 @@ class SelectBox extends React.Component {
     }
 
     onSearchKeyDown(options, evt) {
-        if (evt.keyCode === KEY_CODES.ENTER && this.state.highlightIndex > -1) {
+        if (evt.keyCode === KEY_CODES.ENTER && this.state.highlightedIndex > -1) {
             this.onChange(
-                options[this.state.highlightIndex],
+                options[this.state.highlightedIndex],
                 evt
             );
         } else if (evt.keyCode === KEY_CODES.ARROW_DOWN) {
-            this.highlightIndex(this.state.highlightIndex + 1, options);
+            this.highlightIndex(this.state.highlightedIndex + 1, options);
         } else if (evt.keyCode === KEY_CODES.ARROW_UP) {
-            this.highlightIndex(this.state.highlightIndex - 1, options);
+            this.highlightIndex(this.state.highlightedIndex - 1, options);
         }
     }
 
@@ -292,13 +292,13 @@ class SelectBox extends React.Component {
     }
 
     filterOptions(options) {
-        const filterOptions = options || this.getOptions();
+        const filteredOptions = options || this.getOptions();
 
-        return this.state.query ? filterOptions.filter(
+        return this.state.query ? filteredOptions.filter(
             option => option[this.props.displayProp].toLowerCase().indexOf(
                 this.state.query
             ) >= 0
-        ) : filterOptions;
+        ) : filteredOptions;
     }
 
     isOptionSelected(option) {
@@ -313,22 +313,22 @@ class SelectBox extends React.Component {
     }
 
     highlightIndex(index, options) {
-        let highlightIndex = index;
+        let highlightedIndex = index;
 
-        if (highlightIndex >= options.length) {
-            highlightIndex = options.length - 1;
+        if (highlightedIndex >= options.length) {
+            highlightedIndex = options.length - 1;
         }
 
-        if (highlightIndex < 0) {
-            highlightIndex = 0;
+        if (highlightedIndex < 0) {
+            highlightedIndex = 0;
         }
 
-        this.setState({highlightIndex: highlightIndex});
+        this.setState({highlightedIndex: highlightedIndex});
     }
 
     clear() {
         this.setState({
-            highlightIndex: -1,
+            highlightedIndex: -1,
             value: undefined
         });
     }

diff --git a/src/SelectBox/components/__tests__/SelectBox-test.js b/src/SelectBox/components/__tests__/SelectBox-test.js
@@ -188,7 +188,7 @@ Mingus.createTestCase('SelectBoxTest', {
         );
 
         component.state.value = {display: 'B', value: 'B'};
-        component.state.highlightIndex = 0;
+        component.state.highlightedIndex = 0;
 
         const renderedOptions = component.renderOptions(options);
 
@@ -227,7 +227,7 @@ Mingus.createTestCase('SelectBoxTest', {
         this.assertEqual(component.setState.callCount, 1);
         this.assertTrue(onChange.calledWith(mockEvt, 'mock value'));
         this.assertTrue(component.setState.calledWith({
-            highlightIndex: -1,
+            highlightedIndex: -1,
             showDropDown: false,
             query: '',
             value: 'mock value'
@@ -395,7 +395,7 @@ Mingus.createTestCase('SelectBoxTest', {
         this.assertTrue(component.highlightIndex.calledWith(-2));
 
         mockEvt.keyCode = KEY_CODES.ENTER;
-        component.state.highlightIndex = 1;
+        component.state.highlightedIndex = 1;
         component.onSearchKeyDown(['a', 'b', 'c'], mockEvt);
         this.assertEqual(component.onChange.callCount, 1);
         this.assertEqual(component.highlightIndex.callCount, 2);
@@ -460,19 +460,19 @@ Mingus.createTestCase('SelectBoxTest', {
         component.highlightIndex(1, options);
         this.assertEqual(component.setState.callCount, 1);
         this.assertTrue(component.setState.calledWith({
-            highlightIndex: 1
+            highlightedIndex: 1
         }));
 
         component.highlightIndex(-2, options);
         this.assertEqual(component.setState.callCount, 2);
         this.assertTrue(component.setState.calledWith({
-            highlightIndex: 0
+            highlightedIndex: 0
         }));
 
         component.highlightIndex(10, options);
         this.assertEqual(component.setState.callCount, 3);
         this.assertTrue(component.setState.calledWith({
-            highlightIndex: 2
+            highlightedIndex: 2
         }));
     },
 
@@ -484,7 +484,7 @@ Mingus.createTestCase('SelectBoxTest', {
         component.clear();
         this.assertEqual(component.setState.callCount, 1);
         this.assertTrue(component.setState.calledWith({
-            highlightIndex: -1,
+            highlightedIndex: -1,
             value: undefined
         }));
     },