cartodb/jasmine-ajax
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump jasmine to 2.0.0rc5

Browse Source
This commit is contained in:
Sheel Choksi 2013-10-31 09:54:47 -07:00
parent 08d3e3ffc8
commit b5c99709c3
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -1,4 +1,4 @@
source "https://rubygems.org" source "https://rubygems.org"
gem 'rake' gem 'rake'
gem 'jasmine', "~> 2.0.0.rc3" gem 'jasmine', "~> 2.0.0.rc5"

16
Gemfile.lock
View File

@ -8,15 +8,15 @@ GEM
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
cliver (0.2.2) cliver (0.2.2)
jasmine (2.0.0.rc3) jasmine (2.0.0.rc5)
jasmine-core (~> 2.0.0.rc3) jasmine-core (~> 2.0.0.rc5)
phantomjs phantomjs
rack rack (>= 1.2.1)
rake rake
jasmine-core (2.0.0.rc3) jasmine-core (2.0.0.rc5)
mime-types (1.25) mime-types (2.0)
mini_portile (0.5.1) mini_portile (0.5.2)
multi_json (1.8.1) multi_json (1.8.2)
nokogiri (1.6.0) nokogiri (1.6.0)
mini_portile (~> 0.5.0) mini_portile (~> 0.5.0)
phantomjs (1.8.1.1) phantomjs (1.8.1.1)
@ -38,5 +38,5 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
jasmine (~> 2.0.0.rc3) jasmine (~> 2.0.0.rc5)
rake rake

2
lib/mock-ajax.js
View File

@ -181,7 +181,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
responseTimeout: function() { responseTimeout: function() {
this.readyState = 4; this.readyState = 4;
clock.tick(30000); jasmine.clock().tick(30000);
this.onreadystatechange('timeout'); this.onreadystatechange('timeout');
} }
}); });

4
spec/javascripts/mock-ajax-toplevel-spec.js
View File

@ -299,7 +299,7 @@ describe("Jasmine Mock Ajax (for toplevel)", function() {
describe('when simulating a response with request.responseTimeout', function() { describe('when simulating a response with request.responseTimeout', function() {
beforeEach(function() { beforeEach(function() {
clock.install(); jasmine.clock().install();
client = new fakeGlobal.XMLHttpRequest(); client = new fakeGlobal.XMLHttpRequest();
client.onreadystatechange = onreadystatechange; client.onreadystatechange = onreadystatechange;
@ -318,7 +318,7 @@ describe("Jasmine Mock Ajax (for toplevel)", function() {
}); });
afterEach(function() { afterEach(function() {
clock.uninstall(); jasmine.clock().uninstall();
}); });
it("should not call the success handler", function() { it("should not call the success handler", function() {