Skip to content

Commit

Permalink
Reconfigure Karma and FIX DataTable.spec.ts
Browse files Browse the repository at this point in the history
The new structure required further changes in the testing environment. I have added two bower modules (for now) to the repo, as we do not have them anymore in csWeb (because the example project has moved).
Updated travis to use npm 2 again (since its much faster), and reconfigured karma to include the new files.
  • Loading branch information
erikvullings committed Nov 22, 2015
1 parent e874c4f commit b280d15
Show file tree
Hide file tree
Showing 20 changed files with 3,572 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -3,7 +3,7 @@ language: node_js
node_js:
- "4.0"
install:
- "npm install -g npm@3.5.0"
# - "npm install -g npm@3.5.0"
- "npm install -g typescript@1.6.2"
- "npm install -g bower"
- "npm install"
Expand Down
19 changes: 19 additions & 0 deletions test/bower_components/angular-mocks/.bower.json
@@ -0,0 +1,19 @@
{
"name": "angular-mocks",
"version": "1.4.7",
"main": "./angular-mocks.js",
"ignore": [],
"dependencies": {
"angular": "1.4.7"
},
"homepage": "https://github.com/angular/bower-angular-mocks",
"_release": "1.4.7",
"_resolution": {
"type": "version",
"tag": "v1.4.7",
"commit": "74c65a6a54f39516be40b0afdd99efb461595fd9"
},
"_source": "git://github.com/angular/bower-angular-mocks.git",
"_target": "~1.4.7",
"_originalSource": "angular-mocks"
}
63 changes: 63 additions & 0 deletions test/bower_components/angular-mocks/README.md
@@ -0,0 +1,63 @@
# packaged angular-mocks

This repo is for distribution on `npm` and `bower`. The source for this module is in the
[main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngMock).
Please file issues and pull requests against that repo.

## Install

You can install this package either with `npm` or with `bower`.

### npm

```shell
npm install angular-mocks
```

You can `require` ngMock modules:

```js
var angular = require('angular');
angular.module('myMod', [
require('angular-animate'),
require('angular-mocks/ngMock')
require('angular-mocks/ngAnimateMock')
]);
```

### bower

```shell
bower install angular-mocks
```

The mocks are then available at `bower_components/angular-mocks/angular-mocks.js`.

## Documentation

Documentation is available on the
[AngularJS docs site](https://docs.angularjs.org/guide/unit-testing).

## License

The MIT License

Copyright (c) 2010-2015 Google, Inc. http://angularjs.org

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

0 comments on commit b280d15

Please sign in to comment.