Commit Graph

155 Commits

Author SHA1 Message Date
Anna Bodnia
db328351b9 #1892 fixed multiple definition loops 2016-01-22 20:24:45 +02:00
Anna Bodnia
9a5925f921 #1892 infinite loop when rendering self-references 2016-01-21 18:36:00 +02:00
Tony Tam
d3686c9dbd rebuilt 2016-01-20 08:57:44 -05:00
Anna Bodnia
78a09ea16f #1248 Returns single item in XML when passing array specification 2016-01-20 11:17:43 +02:00
Tony Tam
3aaf121310 added ignore on mock 2016-01-19 22:40:38 -05:00
Tony Tam
7f7f8e73bc updated quotes 2016-01-19 22:23:12 -05:00
Tony Tam
39877cbd0e merged 2016-01-19 22:14:42 -05:00
Anna Bodnia
8a4c6560f5 #1248 implemented display property as attribute 2016-01-18 19:53:53 +02:00
Anna Bodnia
f68420051f #1248 createXMLSample Added handling readyOnly params 2016-01-18 13:50:21 +02:00
Anna Bodnia
4443883546 #1248 createXMLSample added error message 2016-01-15 12:35:11 +02:00
Anna Bodnia
9543ea4671 #1248 createXMLSample moved creating primitive xml into separate function 2016-01-14 19:16:10 +02:00
Anna Bodnia
1c555c00b8 #1248 createXMLSample added XML display for Model in definitions 2016-01-14 17:41:50 +02:00
Anna Bodnia
8917a9bf76 #1248 createXMLSample added object xml representation 2016-01-13 17:13:42 +02:00
Anna Bodnia
455c82c13b #1248 createXMLSample added tests for nested arrays 2016-01-13 12:53:32 +02:00
Anna Bodnia
aa86bb5fe7 #1248 createXMLSample added array 2016-01-13 12:30:12 +02:00
Anna Bodnia
b3ddef2965 #1248 createXMLSample added namespace display 2016-01-12 19:33:00 +02:00
Anna Bodnia
4b0b385102 #1248 createXMLSample made separate function for tagname 2016-01-12 17:14:43 +02:00
Anna Bodnia
b104272ae9 #1248 createXMLSample added getSampleDate method 2016-01-12 15:40:55 +02:00
Anna Bodnia
73feed4ca2 #1248 createXMLSample handle prefix and names in xml 2016-01-12 15:26:59 +02:00
Anna Bodnia
7a8f7016c2 #1248 createXMLSample create xml sample for primitive 2016-01-12 14:06:54 +02:00
Anna Bodnia
901305faa4 Added unit tests setup 2016-01-11 16:53:39 +02:00
Anna Bodnia
66544a87ca Moved tests into v2 folder, added helper to run spec with the same name as test filename 2016-01-05 15:55:40 +02:00
Tony Tam
afe1b3dcdf disabled tests #1826 2015-12-18 12:10:34 -08:00
Laurent Lepinay
7e82b3d66a jshint 2015-09-21 15:36:59 +02:00
Laurent Lepinay
1367e8f6fa Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	test/e2e/v2.js
2015-09-21 14:48:29 +02:00
Tony Tam
20b0dde184 updated timeouts 2015-09-19 11:36:40 -07:00
Tony Tam
f6f8e74586 Update v1.js 2015-09-19 10:39:16 -07:00
Tony Tam
4efefb156a Update v2.js 2015-09-19 10:39:01 -07:00
Tony Tam
058f959669 extended timeouts 2015-09-19 09:51:23 -07:00
unknown
ea2cefa46e Merge branch 'JSONEditor' into JSONEditorMaster
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/less/screen.less
2015-09-10 10:53:15 +02:00
Miroslav Bajtoš
f6d7b6a73f Fix timing issues in unit-tests 2015-08-06 17:22:52 +02:00
Laurent Lepinay
d968fda207 Merge remote-tracking branch 'swagger/develop_2.0' into JSONEditorMerge
Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/html/index.html
	src/main/template/param.handlebars
	src/main/template/param_required.handlebars
2015-07-07 15:31:21 +02:00
Ron
57327f5d1f Updated ToS 2015-06-04 15:15:44 -04:00
Tony Tam
b1efe883db merged logic from #1177 2015-05-08 12:45:00 -07:00
Laurent Lepinay
78c7dda0a9 fixed jshint issues 2015-04-20 10:32:33 +02:00
Laurent Lepinay
f3ee0a436c Merge remote-tracking branch 'upstream/develop_2.0' into JSONEditor
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
2015-04-20 10:16:54 +02:00
laurent lepinay
801acf07e3 Merge remote-tracking branch 'SwaggerOfficial/develop_2.0' into JSONEditor
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	package.json
2015-04-07 05:20:02 -07:00
Tony Tam
b6bf8c2b47 prepare for release 2015-03-28 19:42:11 -07:00
Tony Tam
e214e7a0a2 updated links 2015-03-27 18:51:26 -07:00
laurent lepinay
326f542d04 Merge branch 'develop_2.0' into JSONEditor
Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
2015-03-27 02:15:29 -07:00
Mohsen Azimi
b36c6e596e xit out tests that are failing due to SwaggerJS 2015-03-25 15:23:49 -07:00
Mohsen Azimi
445e0353ca Append .json to v1 spec files to enforce Content-Type when serving in test 2015-03-25 12:49:57 -07:00
laurent lepinay
e7b7465335 Merge branch 'develop_2.0' into JSONEditor
Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/coffeescript/view/MainView.coffee
	src/main/coffeescript/view/OperationView.coffee
	src/main/coffeescript/view/ParameterView.coffee
	src/main/coffeescript/view/ResourceView.coffee
	src/main/coffeescript/view/SignatureView.coffee
	src/main/html/index.html
2015-03-24 07:06:07 -07:00
Mohsen Azimi
c710ad5be1 Fix V2 test 2015-03-12 17:16:15 -07:00
Mohsen Azimi
5c32313880 JSHintify test 2015-03-12 17:01:01 -07:00
Jeremy Whitlock
bdb181cb08 Update swagger-js with latest
* For the e2e tests to run, we had to enable CORS in http-server.  The
  release of http-server that supports CORS hasn't come out yet so we
  have to use http-server@master until then.  Here is the commit I speak
  of: 30f4d1e008
2015-03-11 14:17:11 -06:00
laurent lepinay
bfca6020d2 e2e test for jsoneditor 2015-03-11 05:37:14 -07:00
Mohsen Azimi
b30c99dd63 increase TravisCI timeout to 20s 2015-03-04 09:48:22 -08:00
Mohsen Azimi
2e9631495a increase TravisCI timeout to 10s 2015-03-04 08:53:50 -08:00
Mohsen Azimi
9332911996 Increase timeout for server launch in TravisCI 2015-03-02 11:17:56 -08:00