Skip to content

Merged from develop_2.0 #471

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.

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

Merged
merged 82 commits into from
Jun 5, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
1d5152f
Add support for GFM syntax in model (schema) descriptions by adding a…
May 14, 2015
4105f3f
convert responseModel into schema+$ref
ponelat May 15, 2015
0016cf5
test harness for browser-based tests
mrhanlon May 18, 2015
4fd0e73
add pet/{petId}/uploadImage to test spec
mrhanlon May 18, 2015
d682942
setup firefox for selenium in travis-ci
mrhanlon May 18, 2015
8eddfcc
Merge pull request #436 from mrhanlon/feature/browser-tests-clean
fehguy May 18, 2015
ce4093e
added feature, partial tests for #417
fehguy May 22, 2015
42288e2
fixes ui-1152 by carrying across the schema.requires array
ponelat May 28, 2015
e6abc62
tests, more support for relative refs
fehguy May 28, 2015
34c2ada
updated tests, fixes for resolver
fehguy May 28, 2015
efb0a7e
test updates
fehguy May 29, 2015
626150e
improved unresolved ref handling
fehguy May 29, 2015
2a3cf3e
added test scenarios for #417
fehguy May 29, 2015
6fc1063
fixed locations
fehguy May 29, 2015
11eecf5
corrected = into +=
ponelat Jun 1, 2015
eb5a10f
create npm-shrinkwrap
ponelat Jun 1, 2015
7423ec5
update README example to include responseContentType
ponelat Jun 1, 2015
0601b40
updated, added tests for yaml. Replaces #415
fehguy Jun 3, 2015
5bbd3e5
rebuilt
fehguy Jun 3, 2015
e27dd14
fixed build issue
fehguy Jun 3, 2015
ecfaa61
Merge branch 'feature/relative-ref' into develop_2.0
Jun 3, 2015
e5b594c
rebuilt
Jun 3, 2015
9d8c727
updated gulp
fehguy Jun 3, 2015
74e24e5
Merge branch 'feature/relative-ref' into develop_2.0
fehguy Jun 3, 2015
b6f5dbc
rebased, merged #280
fehguy Jun 3, 2015
5098e9a
rebuilt
fehguy Jun 3, 2015
f2b6372
Merge branch 'nprdm-feature/GFM_descriptions' into develop_2.0
fehguy Jun 3, 2015
d8b34d6
rebuilt
fehguy Jun 3, 2015
f359fba
Merge branch 'ponelat-fix/responseModels' into develop_2.0
fehguy Jun 3, 2015
48c2ce7
merged
fehguy Jun 3, 2015
2ad5414
Merge branch 'ponelat-fix/1152-required-properties' into develop_2.0
fehguy Jun 3, 2015
f671161
merged
fehguy Jun 3, 2015
d3d53f6
Merge branch 'ponelat-fix/add-missing-plus-equals' into develop_2.0
fehguy Jun 3, 2015
f3ac1b4
merged
fehguy Jun 3, 2015
1342756
Merge branch 'ponelat-feature/npm-shrinkwrap' into develop_2.0
fehguy Jun 3, 2015
6dc6d63
Merge pull request #443 from ponelat/fix/readme-example
fehguy Jun 3, 2015
11777b9
added buffer check
fehguy Jun 3, 2015
9ce2ec8
use npm test instead of mocha straight, disable browsertests
ponelat Jun 3, 2015
b8cddbe
update npm-shrinkwrap to latest, and build
ponelat Jun 3, 2015
f9728e0
initial unit tests for the browser
ponelat Jun 3, 2015
5fc20bc
Merge pull request #448 from ponelat/fix/cleanup
fehguy Jun 3, 2015
917e022
add browsertest to travis
ponelat Jun 3, 2015
3dd9d29
added tests for composition
fehguy Jun 3, 2015
5b89381
add done to browsertest
ponelat Jun 3, 2015
e2beb78
Cleaned composition/inheritance samples
webron Jun 3, 2015
8856bde
Merge pull request #451 from ponelat/feature/browser-unit
fehguy Jun 3, 2015
89d0f7c
Merge pull request #453 from swagger-api/webron-patch-1
fehguy Jun 3, 2015
07c2999
added composition logic
fehguy Jun 3, 2015
9ed4376
missing check
fehguy Jun 3, 2015
a9d2919
linting
fehguy Jun 4, 2015
3f4d070
Merge pull request #456 from swagger-api/feature/composition
fehguy Jun 4, 2015
7ce9283
Updated license
webron Jun 4, 2015
1709855
Updated ToS links
webron Jun 4, 2015
f8c56ed
Fixed License
webron Jun 4, 2015
67ab1c7
fix for #460
fehguy Jun 5, 2015
a769bc2
move clientAuthorization to contructor and allow pre-populating
ponelat Jun 4, 2015
ce87fe0
Refactor/add tests for lib/auth
ponelat Jun 4, 2015
40a2db1
replace use of nock with faux-jax which works in browser too
ponelat Jun 4, 2015
d49c613
reduce code in auth.apply
ponelat Jun 5, 2015
85873bb
change email address in spec files to [email protected]
ponelat Jun 5, 2015
7971e66
change oauth urls to swagger.io domain
ponelat Jun 5, 2015
18a456a
default to application/json if we can
ponelat Jun 5, 2015
0f15e31
Merge pull request #463 from ponelat/fix/make-swagger-parent-agnostic
webron Jun 5, 2015
064a95a
Merge pull request #464 from ponelat/feature/default-to-application-j…
fehguy Jun 5, 2015
6e3f8d0
Don't warn when produces contains '*/*'
joeheyming Jun 5, 2015
dd7e628
will to try parse json/yaml, regardless of mime-type
ponelat Jun 5, 2015
5d59afe
add jquery/yaml test
ponelat Jun 5, 2015
ff5fadc
add swagger-spec specs
ponelat Jun 5, 2015
45a50fe
add gulp connect server
ponelat Jun 5, 2015
d84fc25
strip mime-checking for http parsing, partial tests
ponelat Jun 5, 2015
a4a3652
change port on gulp-connect
ponelat Jun 5, 2015
8589751
comment out resolver/yaml test
ponelat Jun 5, 2015
91fbb16
Merge branch 'fix/auth-for-initial-spec' of ssh://github.com/ponelat/…
fehguy Jun 5, 2015
04ef1d5
Merge branch 'ponelat-fix/auth-for-initial-spec' into develop_2.0
fehguy Jun 5, 2015
449ff19
merged
fehguy Jun 5, 2015
3c2498c
fix, rebuild for #470
fehguy Jun 5, 2015
54ba4f8
merged
fehguy Jun 5, 2015
5b16dc7
disabled browser-only tests
fehguy Jun 5, 2015
b8d1d96
Merge branch 'ponelat-fix/test-yaml' into develop_2.0
fehguy Jun 5, 2015
b7010d8
updated version
fehguy Jun 5, 2015
cd46325
merged
fehguy Jun 5, 2015
1df2999
Merge branch 'joeheyming-develop_2.0' into develop_2.0
fehguy Jun 5, 2015
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
Prev Previous commit
Next Next commit
add gulp connect server
  • Loading branch information
ponelat committed Jun 5, 2015
commit 45a50fe92d95ff7bdda015019ecf73c9bc5f3384
16 changes: 15 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ var source = require('vinyl-source-stream');
var karma = require('karma').server;
var karma_config = require('./karma.conf');
var assign = require('object.assign');
var connect = require('gulp-connect');
var cors = require('connect-cors');

var banner = ['/**',
' * <%= pkg.name %> - <%= pkg.description %>',
Expand Down Expand Up @@ -100,7 +102,8 @@ gulp.task('test', function () {
process.env.NODE_ENV = 'test';
return gulp
.src(paths.tests)
.pipe(mocha({reporter: 'spec'}));
.pipe(mocha({reporter: 'spec'}))
.on('error', console.log);
});

gulp.task('watch', ['test'], function () {
Expand All @@ -111,6 +114,17 @@ gulp.task('browsertest', function(done) {
karma.start(karma_config, done);
});

gulp.task('connect', function () {
connect.server({
livereload: false,
root: __dirname + '/test/spec',
port: 8080,
middleware: function (a,b) {
return [ cors(a,b) ];
}
});
});

gulp.task('watch-browsertest', function(done){
var opts = assign({}, karma_config, {singleRun: false});
karma.start(opts, done);
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@
"brfs": "^1.4.0",
"browserify": "^9.0.3",
"chai": "^2.3.0",
"connect-cors": "^0.5.6",
"del": "^1.1.1",
"expect": "1.4.0",
"gulp": "^3.8.10",
"gulp-buffer": "0.0.2",
"gulp-connect": "^2.2.0",
"gulp-header": "^1.2.2",
"gulp-istanbul": "^0.5.0",
"gulp-jshint": "^1.9.0",
Expand Down