Skip to content

Commit 194d0ba

Browse files
committed
Update travis build
allow test to complete by removing watch
1 parent 40eef00 commit 194d0ba

File tree

3 files changed

+27
-55
lines changed

3 files changed

+27
-55
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- 0.10
3+
- node
44

55
before_script:
66
- npm install -g bower

README.md

+24-53
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,6 @@ Angular Schema Form
99

1010
Generate forms from JSON schemas using AngularJS!
1111

12-
Branch Status & New Add-On
13-
--------------------------
14-
This branch will be the **next version of Angular Schema Form**, currently please use
15-
the **examples/example.html** file as the best example to get the framework working.
16-
17-
The example uses **schema-form.js** and **angular-schema-form-bootstrap.js** for the
18-
version of the code it executes, if you want your page to behave the same you
19-
obviously need the same version!
20-
21-
The new Webpack compilation has made it easier to manage files and code and run build
22-
scripts, but it is still not easy enough for users unfamiliar with it... yet.
23-
24-
**NOTE** in order to work simultaneously with ```json-schema-form-core``` you must have it cloned
25-
as a sibling directory to this one to build this library **OR** npm install the version you wish to build with.
26-
27-
Webpack now generates a header to indicate version and date of build. **Do not create PR with the DIST folder.**
28-
29-
### Add-on
30-
To see how to make an **add-on** work I have now included the **calculate** add-on file within the **examples/add-on** directory.
31-
32-
## Yet to be migrated
33-
Currently **copyValueTo** and some **array** related features are not working as expected and remain the highest priority to ensure backwards compatibility is maintained where possible.
34-
35-
36-
The Update
37-
==========
38-
Current development is occuring on the [feature/webpack-babel](https://github.com/json-schema-form/angular-schema-form/blob/feature/webpack-babel/README.md) branch. Once that is stable and passing all tests again it will be replace the current developer branch. Ideally any new PRs should target the new version to avoid migration issues.
39-
4012
The Blog / The Web Site / The Twitter / The Movie
4113
=================================================
4214
[medium.com/@SchemaFormIO](https://medium.com/@SchemaFormIO) / [schemaform.io](http://schemaform.io) / [@SchemaFormIO](http://twitter.com/SchemaFormIO) / [Movie](https://www.youtube.com/watch?v=duBFMipRq2o)
@@ -187,38 +159,38 @@ Don't forget to load the `schemaForm` module or nothing will happen.
187159
angular.module('myModule', ['schemaForm']);
188160
```
189161

190-
Add-ons
191-
------
162+
## Add-ons
192163
There are several add-ons available, for a full list see the [web page](http://schemaform.io/#/third-party-addons).
193164
Your can also [create your own add-ons!](docs/extending.md)
194165

195-
Contributing
196-
------------
166+
## Contributing
197167
Contributions are welcome! Please see [Contributing.md](CONTRIBUTING.md) for more info.
198168

199-
Building
200-
--------
201-
The files in the `dist/` folder, plus dependencies, are all you need to use Schema Form. But if
202-
you'd like to build it yourself, we use [gulp](http://gulpjs.com/).
169+
## Building
170+
The new Webpack compilation has made it easier to manage files and code and run build
171+
scripts, but it is still not easy enough for users unfamiliar with it... yet.
203172

204-
First off, you need to have nodejs installed. Then install all dev dependencies of the
205-
project with npm, install gulp and run the default task.
173+
**NOTE** in order to build simultaneously with ```json-schema-form-core``` you must have it cloned
174+
as a sibling directory to this one **OR** npm install the version you wish to build with.
206175

207-
```bash
208-
$ npm install
209-
$ sudo npm install -g gulp
210-
$ bower install
211-
$ gulp
212-
```
176+
Webpack now generates a header to indicate version and date of build. **Do not create PR with the DIST folder.**
177+
178+
## Branch Status & New Add-On
179+
This branch will be the **next version of Angular Schema Form**, currently please use
180+
the **examples/example.html** file as the best example to get the framework working.
181+
182+
The example uses **angular-schema-form.js** and **angular-schema-form-bootstrap.js** for the
183+
version of the code it executes, if you want your page to behave the same you
184+
obviously need the same version!
213185

214-
The default task uses
215-
[gulp-angular-templatecache](https://github.com/miickel/gulp-angular-templatecache) to compile all
216-
html templates to js and then concatenates and minifies them with the rest of the sources.
186+
### Add-on
187+
To see how to make an **add-on** work I have now included the **calculate** add-on file within the **examples/add-on** directory.
188+
189+
## Yet to be migrated
190+
Currently **copyValueTo** and some **array** related features are not working as expected and remain the highest priority to ensure backwards compatibility is maintained where possible.
217191

218-
You can also run `gulp watch` to have it rebuild on change.
219192

220-
Tests
221-
-----
193+
## Tests
222194
Unit tests are run with [karma](http://karma-runner.github.io) and written using
223195
[mocha](http://visionmedia.github.io/mocha/), [chai](http://chaijs.com/) and
224196
[sinon](http://sinonjs.org/)
@@ -228,11 +200,10 @@ To run the tests:
228200
1. Install all dependencies via NPM.
229201
2. Install dev dependencies with bower.
230202
3. Install the Karma CLI.
231-
4. Run the tests.
203+
4. Run the tests using `npm test`.
232204

233205
```bash
234206
$ npm install
235207
$ bower install
236-
$ sudo npm install -g karma-cli
237-
$ karma start karma.conf.js
208+
$ npm test
238209
```

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"dist": "webpack --config webpack.config.dist.js",
1212
"watch": "webpack --watch",
1313
"testlinux": "rm -fr coverage && ./node_modules/karma/bin/karma start --single-run --browsers PhantomJS karma.conf.js && find coverage/ -name lcov.info -print0 | xargs -0 cat | ./node_modules/coveralls/bin/coveralls.js",
14-
"test": "karma start karma.conf.js --log-level debug"
14+
"test": "karma start karma.conf.js --log-level debug --no-auto-watch",
15+
"tests": "karma start karma.conf.js --log-level debug --auto-watch"
1516
},
1617
"author": "json-schema-form",
1718
"contributors": [

0 commit comments

Comments
 (0)