@@ -1,3 +1,7 @@ +== 0.8.1 2008-10-09 + +* jQuery's Test.Ajax only invokes the mocked url, not all urls that were mocked + == 0.8.0 2008-04-13 * jQuery.ajax mocking History.txt @@ -12,7 +12,7 @@ require 'rake/packagetask' $:.unshift File.dirname(__FILE__) + "/lib" -APP_VERSION = '0.8.0' +APP_VERSION = '0.8.1' APP_NAME = 'drnic_js_test_helpers' RUBYFORGE_PROJECT = 'drnicutilities' APP_FILE_NAME= "#{APP_NAME}.js" Rakefile @@ -30,18 +30,15 @@ if (typeof jQuery != "undefined") { $.ajaxOrig = $.ajax; $.ajax = function(options) { var response = {}; - var found = false; - for (var url in Test.Ajax.MockedRequests) { - var mock = Test.Ajax.MockedRequests[url]; - if (!found && mock) { - mock(options, response); - found = true; - } - }; - if (!found) { + var mock = Test.Ajax.MockedRequests[options]; + if (!mock) { + mock = Test.Ajax.MockedRequests[options.url]; + } + if (mock) { + mock(options, response); + } else { return $.ajaxOrig(options); } - }; } }; src/ajax_mock/jquery.js @@ -88,7 +88,22 @@ assert(self.failed, 'onFailure should have been called'); }); }}, + + "test that only on ajax callback invoked if multiple mocks": function() { with(this) { + var one_called = false; + var two_called = false; + Test.Ajax.setupMock("/one", function(request, response) { + one_called = true; + }); + Test.Ajax.setupMock("/two", function(request, response) { + two_called = true; + }); + $.get('/two'); + assert(!one_called, '/one should not be invoked'); + assert(two_called); + }}, + }); // ]]> </script> test/unit/ajax_mock_jquery_test.html 1b61b0dfe0f216e3d0b9ad93ad636d6bc4e99f92 Dr Nic Williams drnicwilliams@gmail.com http://github.com/drnic/drnic_js_test_helpers/commit/93973972cacb3cfa74d3f6747ed885f7f8389c56 93973972cacb3cfa74d3f6747ed885f7f8389c56 2008-10-08T21:20:31-07:00 2008-10-08T21:20:31-07:00 0.8.1 jQuery's Test.Ajax only invokes the mocked url, not all urls that were mocked 999f76ee8cd45fca6cfdb1f90cd64e0551e1fe04 Dr Nic Williams drnicwilliams@gmail.com