Skip to content

Commit c4bd23b

Browse files
chore(bower): use bower for dependencies
Align the initial repository with the new angular-seed style.
1 parent 7b1d988 commit c4bd23b

File tree

303 files changed

+71
-135561
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+71
-135561
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ tmp
55
.idea
66
.DS_Store
77
angular-phonecat-snapshots
8-
app/lib/angular/docs
9-
app/lib/angular/*.zip
8+
bower_components/

.jshintrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"globalstrict": true,
3+
"globals": {
4+
"angular": false
5+
}
6+
}

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
language: node_js
22
node_js:
3-
- 0.8
3+
- 0.10
44

55
before_script:
66
- export DISPLAY=:99.0
77
- sh -e /etc/init.d/xvfb start
8-
- npm install --quiet -g karma
9-
- ./scripts/web-server.js > /dev/null &
8+
- npm start > /dev/null &
9+
- npm run update-webdriver
1010
- sleep 1 # give server time to start
1111

1212
script:
13-
- karma start config/karma.conf.js --no-auto-watch --single-run --reporters=dots --browsers=Firefox
14-
- karma start config/karma-e2e.conf.js --reporters=dots --browsers=Firefox
13+
- node_modules/.bin/karma start test/karma.conf.js --no-auto-watch --single-run --reporters=dots --browsers=Firefox
14+
- node_modules/.bin/protractor test/protractor-conf.js --browser=firefox

0 commit comments

Comments
 (0)