societyserver · ajinkya007 · Jul 2, 2016 · Jul 2, 2016 · Jul 2, 2016 · Jul 7, 2016
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,10 @@
 language: node_js
 node_js:
-  - 0.8
-
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - npm install --quiet -g karma
-  - ./scripts/web-server.js > /dev/null &
-  - sleep 1 # give server time to start
-
-script:
-  - karma start config/karma.conf.js --no-auto-watch --single-run --reporters=dots --browsers=Firefox
-  - karma start config/karma-e2e.conf.js --reporters=dots --browsers=Firefox
+  - "node"
+  - "6"
+  - "6.1"
+  - "5.11"
+  - "4"
+  - "0.12"
+  - "0.6"
+  - "iojs"
diff --git a/app/css/calendar.css b/app/css/calendar.css
diff --git a/app/index.html b/app/index.html
@@ -10,16 +10,16 @@
 		<script src="lib/components/angular-bootstrap/ui-bootstrap.min.js "></script>
 		<script src="lib/components/angular-bootstrap/ui-bootstrap-tpls.min.js "></script>
 		<script src="lib/angular/localStorageModule.js"></script>
+		<link href="lib/components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"></link>
 		<script src="js/app.js"></script>
 		<script src="js/steam.js"></script>
 		<script src="js/main.js"></script>
 		<script src="js/register.js"></script>
-		<link href="lib/components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"></link>
 	</head>
 
 	<body>
-		<div class="container">
-			<header ng-include="'partials/nav.html'"></header>
+		<header ng-include="'partials/nav.html'"></header>
+       		<div class="container">
 			<div ui-view></div>
 			<footer ng-include="'partials/footer.html'"></footer>
 		<div>

diff --git a/app/js/seed-app.js b/app/js/seed-app.js
diff --git a/app/js/seed-controllers.js b/app/js/seed-controllers.js
diff --git a/app/js/seed-directives.js b/app/js/seed-directives.js
diff --git a/app/js/seed-filters.js b/app/js/seed-filters.js
diff --git a/app/js/seed-services.js b/app/js/seed-services.js
diff --git a/app/partials/home.html b/app/partials/home.html
@@ -0,0 +1 @@
+<p>sTeam-REST API</p>
diff --git a/app/partials/nav.html b/app/partials/nav.html
@@ -1,7 +1,9 @@
-steam-rest examples nav
-
-<ul class="nav nav-pills nav-stacked" ng-controller="NavCtrl">
-	<li ng-repeat="item in mainMenu" ng-class="{ active: isSelected(item.url) }">
-		<a href="#/{{item.url}}" ng-click="selectTab(item.url)">{{item.name}}</a>
-	</li>
-</ul>
+<nav class="navbar navbar-inverse" role="navigation">
+    <div class="navbar-header">
+        <a class="navbar-brand"><b>sTeam-REST API</b></a>
+    </div>
+    <ul class="nav navbar-nav">
+        <li><a ui-sref="home">Home</a></li>
+        <li><a ui-sref="about">About</a></li>
+    </ul>
+</nav>
diff --git a/app/partials/seed-partial1.html b/app/partials/seed-partial1.html
diff --git a/app/partials/seed-partial2.html b/app/partials/seed-partial2.html
diff --git a/app/seed-index.html b/app/seed-index.html
diff --git a/bower.json b/bower.json
@@ -1,5 +1,5 @@
 {
-  "name": "CommunityCalendar",
+  "name": "bower",
   "version": "0.1",
   "private": true,
   "ignore": [
@@ -11,6 +11,9 @@
   ],
   "dependencies": {
     "angular": "",
-    "angular-route": "~1.4.8"
+    "angular-route": "~1.4.8",
+    "angular-ui-router": "",
+    "angular-bootstrap": "",
+    "bootstrap": ""
   }
 }
diff --git a/config/karma-e2e.conf.js b/config/karma-e2e.conf.js
diff --git a/config/karma.conf.js b/config/karma.conf.js
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "TechGrind",
+  "name": "sTeam-REST",
   "version": "0.1.1",
   "private": true,
   "dependencies": {
@@ -11,7 +11,9 @@
     "body-parser": "",
     "serve-static": "",
     "errorhandler": "",
-    "bower": ""
+    "bower": "",
+    "jasmine-node": "",
+    "frisby": ""
   },
   "production_dirs": {
     "coffee_src": "src/",
@@ -21,6 +23,7 @@
   "devDependencies": {
   },
   "scripts": {
-    "postinstall": "bower install"
+    "postinstall": "bower install",
+    "test": "jasmine-node --verbose test"
   }
 }
diff --git a/readme.md b/readme.md
@@ -1,4 +1,7 @@
-about this project
+[![Build Status](https://travis-ci.org/societyserver/steam-rest.svg?branch=master)](https://travis-ci.org/societyserver/steam-rest)
+
+
+About this project
 ==================
 
 this project contains a set of examples and tests for the RESTful API for the
@@ -10,7 +13,7 @@ deployment can be done as static javascript files, and does not need any kind of
 the back-end is a RESTful API written for the sTeam server as used by techgrind.asia
 
 
-development instructions
+Development instructions
 ========================
 
 step 1: install node.js

diff --git a/scripts/e2e-test.bat b/scripts/e2e-test.bat
diff --git a/scripts/e2e-test.sh b/scripts/e2e-test.sh
diff --git a/scripts/test.sh b/scripts/test.sh
diff --git a/src/js/app.coffee b/src/js/app.coffee
@@ -14,7 +14,7 @@ app.config ['$urlRouterProvider', '$stateProvider', ($urlRouterProvider, $stateP
 	$stateProvider.state 'home',
 			url: '/home'
 			templateUrl: 'partials/home.html'
-			controller: 'HomeCtrl'
+			controller: 'NavCtrl'
 
 	$stateProvider.state 'register',
 			url: '/register'

diff --git a/src/js/calendar.coffee b/src/js/calendar.coffee
diff --git a/test/e2e/runner.html b/test/e2e/runner.html
@@ -4,6 +4,7 @@
 		<title>End2end Test Runner</title>
 		<meta charset="utf-8">
 		<script src="../lib/angular/angular-scenario.js" ng-autotest></script>
+		<script src="../lib/angular/angular-mocks.js" ng-autotest></script>
 		<script src="scenarios.js"></script>
 	</head>
 	<body>

diff --git a/test/e2e/seed-runner.html b/test/e2e/seed-runner.html
diff --git a/test/e2e/seed-scenarios.js b/test/e2e/seed-scenarios.js