Merge pull request #84 from ekonstantinidis/rebranding

Rebranding

Author: ekonstantinidis

images/logo-hor-white.png

@@ -23,8 +23,8 @@
       "src/js/components/notification.js": true,
       "src/js/components/notifications.js": true,
       "src/js/components/repository.js": true,
+      "src/js/components/search.js": true,
       "src/js/components/settings.js": true,
-      "src/js/components/footer.js": true,
       "src/js/components/search-input.js": true,
       "src/js/stores/auth.js": true,
       "src/js/stores/notifications.js": true,
@@ -100,7 +100,7 @@
     "grunt-contrib-copy": "=0.8.0",
     "grunt-contrib-less": "=1.0.1",
     "grunt-contrib-watch": "=0.6.1",
-    "jest-cli": "=0.4.17",
+    "jest-cli": "=0.4.18",
     "less": "=2.5.1"
   }
 }

package.json

@@ -24,10 +24,9 @@ describe('Test for Login Component', function () {
         webContents: {
           on: function (event, callback) {
 
-            if (event == 'did-get-redirect-request') {
+            if (event == 'will-navigate') {
               callback(
-                'did-get-redirect-request',
-                'http://www.github.com/?code=123123123',
+                'will-navigate',
                 'http://www.github.com/?code=123123123'
               );
             }
@@ -135,10 +134,9 @@ describe('Test for Login Component - Callback with Error', function () {
         webContents: {
           on: function (event, callback) {
 
-            if (event == 'did-get-redirect-request') {
+            if (event == 'will-navigate') {
               callback(
-                'did-get-redirect-request',
-                'http://www.github.com/?error=FAILURE',
+                'will-navigate',
                 'http://www.github.com/?error=FAILURE'
               );
             }

src/js/__tests__/components/footer.js

@@ -14,24 +14,37 @@ describe('Test for Navigation', function () {
   var apiRequests, Actions, Navigation, AuthStore, Router;
 
   beforeEach(function () {
+    // Mock localStorage
+    window.localStorage = {
+      item: false,
+      setItem: function (item) {
+        this.item = item;
+      },
+      getItem: function () {
+        return this.item;
+      },
+      clear: function () {
+        this.item = false;
+      }
+    };
+
     // Mock Electron's window.require
     // and remote.require('shell')
     window.require = function () {
       return {
+        require: function () {
+          return {
+            openExternal: function () {
+              return {};
+            }
+          };
+        },
         sendChannel: function () {
           return;
         }
       };
     };
 
-    // Mock localStorage
-    window.localStorage = {
-      item: false,
-      getItem: function () {
-        return this.item;
-      }
-    };
-
     apiRequests = require('../../utils/api-requests.js');
     Actions = require('../../actions/actions.js');
     AuthStore = require('../../stores/auth.js');
@@ -140,14 +153,43 @@ describe('Test for Navigation', function () {
 
     var instance;
     React.withContext({router: new Router()}, function () {
-      instance = TestUtils.renderIntoDocument(<Navigation />);
+      instance = TestUtils.renderIntoDocument(<Navigation toggleSearch={function () {
+        // Should toggle the search bar
+      }} />);
     });
 
     expect(instance.componentDidMount).toBeDefined();
+    expect(instance.openBrowser).toBeDefined();
 
     instance.goBack();
     instance.goToSettings();
-
+    instance.openBrowser();
+    instance.showSearch();
   });
 
+  it('Should show the search icon & count label only if notifications', function () {
+
+    spyOn(Actions, 'getNotifications');
+
+    AuthStore.authStatus = function () {
+      return true;
+    };
+
+    var instance = TestUtils.renderIntoDocument(<Navigation />);
+
+    instance.state.notifications = [{
+      title: 'test'
+    }, {
+      title: 'another test'
+    }];
+
+    instance.forceUpdate();
+
+    var searchIcon = TestUtils.findRenderedDOMComponentWithClass(instance, 'fa-search');
+    expect(searchIcon).toBeDefined();
+
+    var countLabel = TestUtils.findRenderedDOMComponentWithClass(instance, 'label-success');
+    expect(countLabel).toBeDefined();
+
+  });
 });

src/js/__tests__/components/login.js

@@ -25,6 +25,9 @@ describe('Test for Notification Component', function () {
               return {};
             }
           };
+        },
+        sendChannel: function () {
+          return;
         }
       };
     };

src/js/__tests__/components/navigation.js

@@ -95,6 +95,9 @@ describe('Test for Notifications Component', function () {
     instance.state.searchTerm = 'gitify';
     matches = instance.matchesSearchTerm(response[0]);
     expect(matches).toBeTruthy();
+
+    instance.state.notifications = ['One', 'Two'];
+    instance.openBrowser();
   });
 
   it('Should only render repos that match the search term', function () {

src/js/__tests__/components/notification.js

@@ -1,16 +1,29 @@
-/* global jest, describe, beforeEach, it, expect, spyOn */
+/* global spyOn, jest, describe, beforeEach, it, expect */
 
 jest.dontMock('reflux');
 jest.dontMock('../../actions/actions.js');
-jest.dontMock('../../components/search-input.js');
+jest.dontMock('../../components/search.js');
 jest.dontMock('../../stores/auth.js');
 
 var React = require('react/addons');
 var TestUtils = React.addons.TestUtils;
 
-describe('Test for Search Input Component', function () {
+describe('Test for Footer', function () {
 
-  var Actions, AuthStore, SearchInput;
+  var Actions, AuthStore, Search;
+
+  window.localStorage = {
+    item: false,
+    setItem: function (item) {
+      this.item = item;
+    },
+    getItem: function () {
+      return this.item;
+    },
+    clear: function () {
+      this.item = false;
+    }
+  };
 
   beforeEach(function () {
     // Mock Electron's window.require
@@ -27,52 +40,37 @@ describe('Test for Search Input Component', function () {
       };
     };
 
-    // Mock localStorage
-    window.localStorage = {
-      item: false,
-      getItem: function () {
-        return this.item;
-      }
-    };
-
     Actions = require('../../actions/actions.js');
     AuthStore = require('../../stores/auth.js');
-    SearchInput = require('../../components/search-input.js');
+    Search = require('../../components/search.js');
   });
 
   it('Should make a search', function () {
 
     spyOn(Actions, 'updateSearchTerm');
     spyOn(Actions, 'clearSearchTerm');
 
-    var instance = TestUtils.renderIntoDocument(<SearchInput />);
+    var instance = TestUtils.renderIntoDocument(<Search showSearch={true} />);
 
     var wrapper = TestUtils.scryRenderedDOMComponentsWithClass(instance, 'search-wrapper');
     expect(wrapper.length).toBe(1);
 
     instance.clearSearch();
 
-    instance.onChange({
+    instance.updateSearchTerm({
       target: {
         value: 'hello'
       }
     });
 
     expect(Actions.updateSearchTerm).toHaveBeenCalledWith('hello');
-  });
 
-  it('Should clear the search', function () {
-    spyOn(Actions, 'clearSearchTerm');
-
-    var instance = TestUtils.renderIntoDocument(<SearchInput />);
-    expect(Actions.clearSearchTerm).not.toHaveBeenCalled();
-
-    instance.clearSearch();
-    expect(Actions.clearSearchTerm).toHaveBeenCalled();
+    instance.componentWillReceiveProps({showSearch: false});
+    expect(Actions.updateSearchTerm).toHaveBeenCalledWith('');
   });
 
   it('Should only render clear button if search term is not empty', function () {
-    var instance = TestUtils.renderIntoDocument(<SearchInput />);
+    var instance = TestUtils.renderIntoDocument(<Search showSearch={true} />);
 
     var clearButton = TestUtils.scryRenderedDOMComponentsWithClass(instance, 'octicon-x');
     expect(clearButton.length).toBe(0);
@@ -84,4 +82,9 @@ describe('Test for Search Input Component', function () {
     expect(clearButton.length).toBe(1);
   });
 
+  it('Should hide the search bar', function () {
+    var instance = TestUtils.renderIntoDocument(<Search showSearch={false} />);
+    var searchBar = TestUtils.scryRenderedDOMComponentsWithClass(instance, 'search-bar');
+    expect(searchBar.length).toBe(0);
+  });
 });

src/js/__tests__/components/notifications.js

@@ -3,7 +3,7 @@ var Router = require('react-router');
 
 var AuthStore = require('./stores/auth');
 var Navigation = require('./components/navigation');
-var Footer = require('./components/footer');
+var SearchBar = require('./components/search');
 var LoginPage = require('./components/login');
 var NotificationsPage = require('./components/notifications');
 var SettingsPage = require('./components/settings');
@@ -23,12 +23,24 @@ var App = React.createClass({
     }
   },
 
+  getInitialState: function () {
+    return {
+      showSearch: false
+    };
+  },
+
+  toggleSearch: function () {
+    this.setState({
+      showSearch: !this.state.showSearch
+    });
+  },
+
   render: function () {
     return (
       <div>
-        <Navigation />
+        <Navigation toggleSearch={this.toggleSearch} />
+        <SearchBar showSearch={this.state.showSearch} />
         <RouteHandler />
-        <Footer />
       </div>
     );
   }