Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bower-powered test dependencies #154

Merged
merged 8 commits into from
Nov 20, 2014
Merged

Bower-powered test dependencies #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b70d106
chore(test): Use bower to fetch test dependencies
circlingthesun Nov 8, 2014
2ee8a74
fix(test): Reverted back to JQuery 1.8.2 and upgraded to Angular 1.3.2
circlingthesun Nov 8, 2014
43ecc98
fix(demo): Revert to Foudation 5.2.0 to unbreak styles
circlingthesun Nov 9, 2014
4f6ae13
Merge branch 'angular-1.3.2' of git://github.com/circlingthesun/angul…
jbrowning Nov 20, 2014
583470b
Use default bower_components path. Remove bower install from grunt.
jbrowning Nov 20, 2014
6ac3b40
Bump angular versions
jbrowning Nov 20, 2014
48de18c
.gitignore bower_components
jbrowning Nov 20, 2014
b7f92fd
Remove bower from package.json. Update README.
jbrowning Nov 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ dist
coverage/

node_modules
bower_components
npm-debug.log

template/**/*.js
4 changes: 2 additions & 2 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ module.exports = function(grunt) {
grunt.util.linefeed = '\n';

grunt.initConfig({
ngversion: '1.3.1',
fdversion: '5.4.7',
ngversion: '1.3.3',
fdversion: '5.2.0',
faversion: '4.2.0',
modules: [],//to be filled in by build task
pkg: grunt.file.readJSON('package.json'),
Expand Down
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,10 @@ We are always looking for the quality contributions! Please check the [CONTRIBUT

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

#### Build
* Build the whole project: `grunt` - this will run `lint`, `test`, and `concat` targets
Expand Down
26 changes: 26 additions & 0 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"name": "angular-foundation",
"homepage": "http://pineconellc.github.io/angular-foundation/",
"authors": [
"Pinecone, LLC"
],
"license": "MIT",
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"angular": "=1.3.3",
"angular-legacy": "angular#1.2.26",
"angular-mocks": "=1.3.3",
"angular-mocks-legacy": "angular-mocks#1.2.26",
"jquery": "=1.8.2"
},
"resolutions": {
"angular": "=1.3.3"
}
}
6 changes: 3 additions & 3 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ module.exports = function(config) {
frameworks: ['jasmine'],
// list of files / patterns to load in the browser
files: [
'misc/test-lib/jquery-1.8.2.min.js',
'misc/test-lib/angular.js',
'misc/test-lib/angular-mocks.js',
'bower_components/jquery/jquery.js',
'bower_components/angular/angular.js',
'bower_components/angular-mocks/angular-mocks.js',
'misc/test-lib/helpers.js',
'src/**/*.js',
'template/**/*.js'
Expand Down
Loading