Commit Graph

247 Commits

Author SHA1 Message Date
Gregg Van Hove
cef5bbcc6c Merge branch 'master' of https://github.com/mooglemoogle/jasmine-ajax into mooglemoogle-master
- Merges #147
- Fixes #142
2016-02-16 17:00:12 -08:00
Gregg Van Hove
70d5dc42f3 Merge branch 'joeyparrish-master'
- Merges #146
- Fixes #145
2016-02-16 16:39:30 -08:00
Christopher Rock
0ad4e838a6 Reversing combined file change 2016-01-23 00:13:24 -05:00
Christopher Rock
ca2ee0202a Clearing request headers on fakeRequest.open()
https://github.com/jasmine/jasmine-ajax/issues/142
2016-01-19 22:01:43 -05:00
Joey Parrish
4df24d7e81 Add responseURL support
This adds the ability to mock responseURL, which is used to detect the
ultimate request URL when following 302 redirects.

For more information, see:
https://xhr.spec.whatwg.org/#the-responseurl-attribute

Closes jasmine/jasmine-ajax#145
2016-01-12 14:13:39 -08:00
Gregg Van Hove
920f8e7771 Merge branch 'salticus-master' 2015-10-28 12:09:21 -07:00
Gregg Van Hove
27fbe694e5 Merge branch 'master' of https://github.com/salticus/jasmine-ajax into salticus-master 2015-10-28 12:09:12 -07:00
Gregg Van Hove
00038a117a Include all spec file when running against combined file 2015-10-28 12:06:53 -07:00
Gregg Van Hove
d50bc0d414 add new safari back, it's version 9, not 8.1 2015-10-26 17:19:23 -07:00
Gregg Van Hove
3c973be6b7 Merge pull request #136 from jonnyreeves/patch-2
Add missing `'`
2015-10-24 08:05:20 -07:00
John Reeves
2c6c057eda Add missing '
Sorry about that :)
2015-10-24 07:24:34 +01:00
Gregg Van Hove
3fd6ffa5e1 Don't want to fight with sauce/travis about safari 8.1 right now 2015-10-23 16:25:46 -07:00
Gregg Van Hove
8353d631ad update travis matrix to match saucelabs supported browsers 2015-10-23 16:20:15 -07:00
Gregg Van Hove
0f2a5ff60c Merge pull request #135 from jonnyreeves/patch-1
Add NPM installation instructions
2015-10-23 16:06:23 -07:00
John Reeves
4b2c2d9903 Add NPM installation instructions
Fixes #131
2015-10-19 21:20:52 +01:00
Robert Stewart
056f96c935 Throw exception on multiple calls to jasmine.Ajax.uninstall.
Running multiple tests under Karma showed some race condition behavior.
2015-08-18 10:59:00 -06:00
Gregg Van Hove
8b68db5163 Update messaging for 1.3 compatibility
Fix #121
2015-07-14 15:11:57 -07:00
Gregg Van Hove
4fbd1c9e3d Update version number in concatenated file 2015-07-02 16:12:44 -07:00
Gregg Van Hove
b54a002d46 bump version to 3.2.0 2015-07-02 16:00:08 -07:00
Gregg Van Hove
3807269d27 Merge branch 'mjeanroy-issue_108'
Fixes #114
2015-06-12 14:17:20 -07:00
Mickael Jeanroy
d3c52e8e29 Set the this context for event handler to the current XHR and pass proper ProgressEvent arguments
Fixes #108
2015-06-12 14:16:56 -07:00
Gregg Van Hove
681f473f3d Merge branch 'SunboX-match-data-with-regex'
Fixes #116
2015-06-12 13:34:10 -07:00
unknown
6e77139011 added feature to match data/query against RegExp
Fixes #115
2015-06-12 13:33:26 -07:00
Gregg Van Hove
b7c374a7a6 Merge pull request #112 from Mordred/feature/request-stub
Allow error and timeout using RequestStub
2015-06-05 06:47:31 -07:00
Martin Jantosovic
732f91f5f1 Allow error and timeout using RequestStub
Closes #111
2015-06-05 07:12:05 +02:00
Gregg Van Hove and Noah Denton
e1d61c4143 Use travis sauce connect addon 2015-05-18 17:27:27 -07:00
Gregg Van Hove
86be5d3580 bump version to 3.1.1 2015-05-04 16:30:14 -07:00
Gregg Van Hove
35c1e4cd48 Loosen bower dependency on jasmine
Fixes #106
2015-04-10 13:42:12 -07:00
Gregg Van Hove
60a31169f0 Merge pull request #104 from mjeanroy/fix-97
Event readystatechange is triggered when headers are available
2015-04-09 13:44:38 -07:00
Mickael Jeanroy
5d96ce9609 Event readystatechange is triggered when headers are available
According to the specification, readyState value must
be equal to 2 and readystatechange event should be triggered
once status and headers are available.

Close #97
2015-04-09 22:27:02 +02:00
Gregg Van Hove
3212c5f04a Merge branch 'mjeanroy-readystatechange'
Closes #103
2015-04-09 10:24:01 -07:00
Mickael Jeanroy
d2762c59f0 Event 'readystatechange' is now triggered
Close #102
2015-04-09 10:21:24 -07:00
Gregg Van Hove
eecce5403a Merge branch 'jhamon-throw-error-when-installed-multiple-times' 2015-04-01 08:00:43 -07:00
Jen Hamon
fb5a98e63e Throw error on duplicate calls to MockAjax#install.
Fixes #96
2015-04-01 08:00:23 -07:00
Gregg Van Hove
778966f60b Merge pull request #99 from jhamon/readme-tweaks
Readme tweaks and updated links
2015-04-01 07:57:31 -07:00
Jen Hamon
ea68594915 Update links 2015-03-31 21:10:54 -07:00
Jen Hamon
4caea6ec1c Add github-flavored markdown syntax highlighting 2015-03-31 19:57:09 -07:00
Jen Hamon
5b0bd44aa7 Update copyright year 2015-03-31 19:28:26 -07:00
Gregg Van Hove
96dc135a18 rename 3.1 release notes to be consistent 2015-03-12 13:15:35 -07:00
Gregg Van Hove
de8f5bc773 Bump version to 3.1.0 2015-03-12 12:56:08 -07:00
Gregg Van Hove
3a80483f30 Add version number to combined file
Fixes #93
2015-03-12 12:49:27 -07:00
Gregg Van Hove and Molly Trombley-McCann
55de6dffaf Add safari 7 & 8 to browser matrix 2015-03-04 11:40:34 -08:00
Gregg Van Hove and Molly Trombley-McCann
1b6fbf2322 Merge branch 'illiptic-master' 2015-03-04 11:35:42 -08:00
Gregg Van Hove and Molly Trombley-McCann
09861cacba Cleanup removeEventListener
- Add tests
- Extract an EventBus
2015-03-04 11:34:55 -08:00
Gregg Van Hove and Molly Trombley-McCann
ef26ab41af Merge branch 'master' of https://github.com/illiptic/jasmine-ajax into illiptic-master 2015-03-04 09:42:08 -08:00
Gregg Van Hove
e2fd48f512 Merge pull request #94 from tomalec/andReturn_responseHeaders
Add `responseHeaders` to `andReturn` s options
2015-02-27 16:10:15 -08:00
Tomek Wytrebowicz
f0b3027f18 Add spec for responseHeaders in andRaturn method 2015-02-17 09:58:10 +01:00
Tomek Wytrebowicz
ccb0ae7853 Add responseHeaders to andReturn s options 2015-02-16 17:26:22 +01:00
slackersoft
c3639ab040 Version bump for 3.0 2015-01-26 10:19:24 -08:00
slackersoft
821c8e8edf Fix jshint issues in Gruntfile 2015-01-26 10:15:37 -08:00