diff --git a/imports/ui/components/app-navigation.js b/imports/ui/components/app-navigation.js
index 4427de7..701cf6b 100644
--- a/imports/ui/components/app-navigation.js
+++ b/imports/ui/components/app-navigation.js
@@ -1,5 +1,6 @@
import React from 'react';
import { Navbar, Nav, NavItem, NavDropdown, MenuItem } from 'react-bootstrap';
+import { Link } from 'react-router';
import { PublicNavigation } from './public-navigation';
import { AuthenticatedNavigation } from './authenticated-navigation';
@@ -12,10 +13,13 @@ export class AppNavigation extends React.Component {
return
- Application Name
+ Application Name
+
- { this.renderNavigation( this.props.hasUser, this.props.activeRoute ) }
+
+ { this.renderNavigation( this.props.hasUser, this.props.activeRoute ) }
+
;
}
}
diff --git a/imports/ui/components/authenticated-navigation.js b/imports/ui/components/authenticated-navigation.js
index f9ef139..dfa778c 100644
--- a/imports/ui/components/authenticated-navigation.js
+++ b/imports/ui/components/authenticated-navigation.js
@@ -1,7 +1,6 @@
import React from 'react';
-import { browserHistory } from 'react-router';
+import { browserHistory, IndexLink, Link } from 'react-router';
import { Nav, NavItem, NavDropdown, MenuItem } from 'react-bootstrap';
-import { IndexLinkContainer, LinkContainer } from 'react-router-bootstrap';
const handleLogout = () => {
return Meteor.logout( () => browserHistory.push( '/login' ) );
@@ -15,28 +14,16 @@ const userName = () => {
}
};
-export const AuthenticatedNavigation = React.createClass({
- isActive( route, indexOnly ) {
- return this.props.activeRoute( route, indexOnly );
- },
- handleRouteChange() {
- this.forceUpdate();
- },
- render() {
- return
-
-
-
;
- }
-});
+export const AuthenticatedNavigation = () => (
+
+
+
+
+)
diff --git a/imports/ui/components/public-navigation.js b/imports/ui/components/public-navigation.js
index f97999f..0304c69 100644
--- a/imports/ui/components/public-navigation.js
+++ b/imports/ui/components/public-navigation.js
@@ -2,21 +2,9 @@ import React from 'react';
import { Link } from 'react-router';
import { Nav, NavItem } from 'react-bootstrap';
-export const PublicNavigation = React.createClass({
- isActive( route, indexOnly ) {
- return this.props.activeRoute( route, indexOnly ) ? 'active' : '';
- },
- handleRouteChange() {
- this.forceUpdate();
- },
- render() {
- return ;
- }
-});
+export const PublicNavigation = () => (
+
+)
diff --git a/package.json b/package.json
index d0d359f..7b57d18 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,14 @@
"description": "Application description.",
"scripts": {
"start": "meteor --settings settings-development.json",
+ "chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests",
+ "chimp-test": "chimp --ddp=http://localhost:3000 --mocha --path=tests",
"staging": "meteor deploy staging.meteor.com --settings settings-development.json",
"production": "meteor deploy production.meteor.com --settings settings-production.json"
},
"devDependencies": {},
"dependencies": {
+ "chimp": "^0.33.0",
"react": "^0.14.8",
"react-addons-pure-render-mixin": "^0.14.8",
"react-bootstrap": "^0.28.4",
diff --git a/tests/login.js b/tests/login.js
new file mode 100644
index 0000000..dac25a4
--- /dev/null
+++ b/tests/login.js
@@ -0,0 +1,30 @@
+describe( 'Log In', function() {
+ beforeEach( function() {
+ server.execute( function() {
+ var user = Meteor.users.findOne( { 'emails.address': 'carl.winslow@abc.com' } );
+ if ( user ) {
+ Meteor.users.remove( user._id );
+ }
+ });
+ });
+
+ it( 'should allow us to login @watch', function() {
+ server.execute( function() {
+ Accounts.createUser({
+ email: 'carl.winslow@abc.com',
+ password: 'bigguy1989',
+ profile: {
+ name: { first: 'Carl', last: 'Winslow' }
+ }
+ });
+ });
+
+ browser.url( 'http://localhost:3000/login' )
+ .setValue( '[name="emailAddress"]', 'carl.winslow@abc.com' )
+ .setValue( '[name="password"]', 'bigguy1989' )
+ .submitForm( 'form' );
+
+ browser.waitForExist( '.jumbotron' );
+ expect( browser.getUrl() ).to.equal( 'http://localhost:3000/' );
+ });
+});
diff --git a/tests/signup.js b/tests/signup.js
new file mode 100644
index 0000000..8c64042
--- /dev/null
+++ b/tests/signup.js
@@ -0,0 +1,22 @@
+describe( 'Sign Up', function() {
+ beforeEach( function() {
+ server.execute( function() {
+ var user = Meteor.users.findOne( { 'emails.address': 'carl.winslow@abc.com' } );
+ if ( user ) {
+ Meteor.users.remove( user._id );
+ }
+ });
+ });
+
+ it( 'should create a new user and login with redirect to index @watch', function() {
+ browser.url( 'http://localhost:3000/signup' )
+ .setValue( '[name="firstName"]', 'Carl' )
+ .setValue( '[name="lastName"]', 'Winslow' )
+ .setValue( '[name="emailAddress"]', 'carl.winslow@abc.com' )
+ .setValue( '[name="password"]', 'bigguy1989' )
+ .submitForm( 'form' );
+
+ browser.waitForExist( '.jumbotron' );
+ expect( browser.getUrl() ).to.equal( 'http://localhost:3000/' );
+ });
+});