Skip to content

Commit

Permalink
Add travis integration, 1.2.16 and 1.3.0 test configs
Browse files Browse the repository at this point in the history
  • Loading branch information
artch committed May 8, 2014
1 parent f638ce9 commit 1e238d0
Show file tree
Hide file tree
Showing 17 changed files with 79 additions and 40,186 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
language: node_js
node_js:
- '0.10'
before_script:
- 'npm install -g grunt-cli'
16 changes: 12 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,26 @@ module.exports = function(grunt) {
},

karma: {
angular115: {
angular11: {
options: {
keepalive: true,
configFile: 'karma-angular-1.1.5.conf.js',
configFile: 'karma-angular-1.1.conf.js',
autoWatch: false,
singleRun: true
}
},
angular120: {
angular12: {
options: {
keepalive: true,
configFile: 'karma-angular-1.2.0rc1.conf.js',
configFile: 'karma-angular-1.2.conf.js',
autoWatch: false,
singleRun: true
}
},
angular13: {
options: {
keepalive: true,
configFile: 'karma-angular-1.3.conf.js',
autoWatch: false,
singleRun: true
}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular-route-segment
angular-route-segment [![Build Status](https://secure.travis-ci.org/artch/angular-route-segment.png?branch=master)](https://travis-ci.org/artch/angular-route-segment)
=====================

An extension for [AngularJS](http://angularjs.org/) [$route](http://docs.angularjs.org/api/ngRoute.$route) service which supports tree-like nested views and routes hierarchy, and advanced loading flow handling.
Expand All @@ -21,12 +21,12 @@ Or use this CDN link (thanks to [cdnjs.com](http://cdnjs.com)):
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-route-segment/1.2.3/angular-route-segment.min.js"></script>
```

Tested with AngularJS 1.1.5 and 1.2.0rc1 (you must include `ngRoute` module in 1.2.x!).
Tested with AngularJS 1.1.5, 1.2.16 and 1.3.0-beta.7.

Overview
--------

This library is intended to provide the lacking functionality of nested routing to AngularJS applications. It is widely known, there are no ways to keep the page state unchanged when only a part of it should be updated via routing mechanics - the `$route` service re-creates the whole scope after a route is changed, losing its state completely. **route-segment** gives you a way to handle this.
This library is intended to provide the lacking functionality of nested routing to AngularJS applications. It is widely known, there are no ways to keep the parent state unchanged when children are updated via routing mechanics - the `$route` service re-creates the whole scope after a route is changed, losing its state completely. **route-segment** gives you a way to handle this.

The library provides two pieces of code: `$routeSegment` service and `app-view-segment` directive. Both are placed in their own modules which you must include as dependencies in your app module:

Expand Down
4 changes: 2 additions & 2 deletions karma-angular-1.1.5.conf.js → karma-angular-1.1.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ module.exports = function(config) {
files: [
'test/lib/jquery.min.js',
'test/lib/helpers.js',
'test/lib/angular-1.1.5/angular.js',
'test/lib/angular-1.1.5/angular-*.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.js',
'http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.1.5/angular-mocks.js',
'src/**/*.js',
'test/unit/**/*.js'
],
Expand Down
23 changes: 0 additions & 23 deletions karma-angular-1.2.0rc1.conf.js

This file was deleted.

24 changes: 24 additions & 0 deletions karma-angular-1.2.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module.exports = function(config) {
config.set({

basePath: './',

frameworks: ["jasmine"],

files: [
'test/lib/jquery.min.js',
'test/lib/helpers.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-route.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-animate.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-mocks.js',
'src/**/*.js',
'test/unit/**/*.js'
],

autoWatch: true,

browsers: ['PhantomJS']

});
};
24 changes: 24 additions & 0 deletions karma-angular-1.3.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module.exports = function(config) {
config.set({

basePath: './',

frameworks: ["jasmine"],

files: [
'test/lib/jquery.min.js',
'test/lib/helpers.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.7/angular.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.7/angular-route.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.7/angular-animate.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.7/angular-mocks.js',
'src/**/*.js',
'test/unit/**/*.js'
],

autoWatch: true,

browsers: ['PhantomJS']

});
};
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@
"karma-phantomjs-launcher": "",
"karma-junit-reporter": "",
"grunt-git-describe": ""
},
"scripts": {
"test": "grunt karma"
}
}
Loading

0 comments on commit 1e238d0

Please sign in to comment.