Skip to content

Commit e7db621

Browse files
committed
Merge pull request #154 from pineconellc/bower_test_dependencies
Bower-powered test dependencies
2 parents 8bd6e50 + b7f92fd commit e7db621

9 files changed

+35
-27924
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ dist
1818
coverage/
1919

2020
node_modules
21+
bower_components
2122
npm-debug.log
2223

2324
template/**/*.js

Gruntfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ module.exports = function(grunt) {
88
grunt.util.linefeed = '\n';
99

1010
grunt.initConfig({
11-
ngversion: '1.3.1',
12-
fdversion: '5.4.7',
11+
ngversion: '1.3.3',
12+
fdversion: '5.2.0',
1313
faversion: '4.2.0',
1414
modules: [],//to be filled in by build task
1515
pkg: grunt.file.readJSON('package.json'),

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,10 @@ We are always looking for the quality contributions! Please check the [CONTRIBUT
8585

8686
### Development
8787
#### Prepare your environment
88-
* Install [Node.js](http://nodejs.org/) and NPM (should come with)
89-
* Install global dev dependencies: `npm install -g grunt-cli karma`
88+
* Install [Node.js](http://nodejs.org/) which should include `npm`
89+
* Install global dev dependencies: `npm install -g grunt-cli karma bower`
9090
* Instal local dev dependencies: `npm install` while current directory is foundation repo
91+
* Install test dependencies: `bower install`
9192

9293
#### Build
9394
* Build the whole project: `grunt` - this will run `lint`, `test`, and `concat` targets

bower.json

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"name": "angular-foundation",
3+
"homepage": "http://pineconellc.github.io/angular-foundation/",
4+
"authors": [
5+
"Pinecone, LLC"
6+
],
7+
"license": "MIT",
8+
"private": true,
9+
"ignore": [
10+
"**/.*",
11+
"node_modules",
12+
"bower_components",
13+
"test",
14+
"tests"
15+
],
16+
"dependencies": {
17+
"angular": "=1.3.3",
18+
"angular-legacy": "angular#1.2.26",
19+
"angular-mocks": "=1.3.3",
20+
"angular-mocks-legacy": "angular-mocks#1.2.26",
21+
"jquery": "=1.8.2"
22+
},
23+
"resolutions": {
24+
"angular": "=1.3.3"
25+
}
26+
}

karma.conf.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ module.exports = function(config) {
66
frameworks: ['jasmine'],
77
// list of files / patterns to load in the browser
88
files: [
9-
'misc/test-lib/jquery-1.8.2.min.js',
10-
'misc/test-lib/angular.js',
11-
'misc/test-lib/angular-mocks.js',
9+
'bower_components/jquery/jquery.js',
10+
'bower_components/angular/angular.js',
11+
'bower_components/angular-mocks/angular-mocks.js',
1212
'misc/test-lib/helpers.js',
1313
'src/**/*.js',
1414
'template/**/*.js'

0 commit comments

Comments
 (0)