From c0d9cad6c8bad51d46e1a09e5715579d8889adc6 Mon Sep 17 00:00:00 2001 From: Jesse Streb Date: Fri, 24 Dec 2010 08:27:24 -0500 Subject: [PATCH 1/6] Fixed issue in which we were changing the location.href to a hardcoded value rather then just the hash. --- tests/integration/helpers/spec_helpers.js | 9 ------- tests/integration/specs/ListviewSpec.js | 29 +++++++++++++---------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/tests/integration/helpers/spec_helpers.js b/tests/integration/helpers/spec_helpers.js index 960c73b6..54388c91 100644 --- a/tests/integration/helpers/spec_helpers.js +++ b/tests/integration/helpers/spec_helpers.js @@ -1,12 +1,3 @@ -/*function basicListViewHTML() { - var html = ''; - - return html; -}*/ var listViewHelper = {}; (function ($, lvh, undefined ) { diff --git a/tests/integration/specs/ListviewSpec.js b/tests/integration/specs/ListviewSpec.js index f9d0a554..68d978ba 100644 --- a/tests/integration/specs/ListviewSpec.js +++ b/tests/integration/specs/ListviewSpec.js @@ -42,8 +42,13 @@ describe("Listviews", function() { describe("Nested List", function() { it("should change the page to the nested list and make sure the page was enhanced.", function() { listViewHelper.resetForPage($('#nested-list-test')) - location.href = "http://localhost:8888/tests/integration/runner.html#nested-list-test"; - $.mobile.changePage(listViewHelper.currentPage()); + location.href = location.href.split('#')[0] + "#nested-list-test"; + + /* + * Calling change page directly does not update the history so breaks these tests. Checking in passing tests for now + * but once pushState is tackled we should change some of these tests to also use changePage along with just hash changes. + */ + //$.mobile.changePage(listViewHelper.currentPage()); waitsFor(function() { return listViewHelper.transitionComplete(); @@ -90,8 +95,8 @@ describe("Listviews", function() { describe("Ordered Lists", function() { it("should change the page to the numbered list and make sure the page was enhanced.", function() { listViewHelper.resetForPage($('#numbered-list-test')); - location.href = "http://localhost:8888/tests/integration/runner.html#numbered-list-test"; - $.mobile.changePage(listViewHelper.currentPage()); + location.href = location.href.split('#')[0] + "#numbered-list-test"; + //$.mobile.changePage(listViewHelper.currentPage()); waitsFor(function() { return listViewHelper.transitionComplete(); @@ -134,8 +139,8 @@ describe("Listviews", function() { describe("read only list", function() { it("should change the page to the Read only list and make sure the page was enhanced.", function() { listViewHelper.resetForPage($('#read-only-list-test')); - location.href = "http://localhost:8888/tests/integration/runner.html#read-only-list-test"; - $.mobile.changePage(listViewHelper.currentPage()); + location.href = location.href.split('#')[0] + "#read-only-list-test"; + //$.mobile.changePage(listViewHelper.currentPage()); waitsFor(function() { return listViewHelper.transitionComplete(); @@ -164,8 +169,8 @@ describe("Listviews", function() { describe("split view list", function() { it("should change the page to the split view and list view and enhance the page correctly.", function() { listViewHelper.resetForPage($('#split-list-test')); - location.href = "http://localhost:8888/tests/integration/runner.html#split-list-test"; - $.mobile.changePage(listViewHelper.currentPage()); + location.href = location.href.split('#')[0] + "#split-list-test"; + //$.mobile.changePage(listViewHelper.currentPage()); waitsFor(function() { return listViewHelper.transitionComplete(); @@ -221,8 +226,8 @@ describe("Listviews", function() { describe("List dividers", function() { it("should make the list divider page the active page and enhance it correctly.", function() { listViewHelper.resetForPage($('#list-divider-test')); - location.href = "http://localhost:8888/tests/integration/runner.html#list-divider-test"; - $.mobile.changePage(listViewHelper.currentPage()); + location.href = location.href.split('#')[0] + "#list-divider-test"; + //$.mobile.changePage(listViewHelper.currentPage()); waitsFor(function() { return listViewHelper.transitionComplete(); @@ -238,8 +243,8 @@ describe("Listviews", function() { describe("Search Filter", function() { it("should make the search filter page the active page and enhance it correctly.", function() { listViewHelper.resetForPage($('#search-filter-test')); - location.href = "http://localhost:8888/tests/integration/runner.html#search-filter-test"; - $.mobile.changePage(listViewHelper.currentPage()); + location.href = location.href.split('#')[0] + "#search-filter-test"; + //$.mobile.changePage(listViewHelper.currentPage()); waitsFor(function() { return listViewHelper.transitionComplete(); From 35c2fe8aa58a809e107caef358417f8fb4c28bf5 Mon Sep 17 00:00:00 2001 From: Jesse Streb Date: Fri, 24 Dec 2010 08:27:24 -0500 Subject: [PATCH 2/6] Ported Jasmine integration tests over to Qunit tests. Kept these in a different folder of integration tests has there purpose is to test at a page level rather then a method by method level. --- external/jasmine-1.0.1/MIT.LICENSE | 20 - external/jasmine-1.0.1/jasmine-html.js | 188 -- external/jasmine-1.0.1/jasmine.css | 166 -- external/jasmine-1.0.1/jasmine.js | 2421 ----------------- tests/integration/helpers/spec_helpers.js | 49 - .../{runner.html => listviews/index.html} | 37 +- .../listviews/listview_integration.js | 197 ++ tests/integration/specs/ListviewSpec.js | 280 -- tests/jquery.testHelper.js | 9 + 9 files changed, 222 insertions(+), 3145 deletions(-) delete mode 100644 external/jasmine-1.0.1/MIT.LICENSE delete mode 100644 external/jasmine-1.0.1/jasmine-html.js delete mode 100644 external/jasmine-1.0.1/jasmine.css delete mode 100644 external/jasmine-1.0.1/jasmine.js delete mode 100644 tests/integration/helpers/spec_helpers.js rename tests/integration/{runner.html => listviews/index.html} (80%) create mode 100644 tests/integration/listviews/listview_integration.js delete mode 100644 tests/integration/specs/ListviewSpec.js diff --git a/external/jasmine-1.0.1/MIT.LICENSE b/external/jasmine-1.0.1/MIT.LICENSE deleted file mode 100644 index 1eb9b49e..00000000 --- a/external/jasmine-1.0.1/MIT.LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2008-2010 Pivotal Labs - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/external/jasmine-1.0.1/jasmine-html.js b/external/jasmine-1.0.1/jasmine-html.js deleted file mode 100644 index 81402b9c..00000000 --- a/external/jasmine-1.0.1/jasmine-html.js +++ /dev/null @@ -1,188 +0,0 @@ -jasmine.TrivialReporter = function(doc) { - this.document = doc || document; - this.suiteDivs = {}; - this.logRunningSpecs = false; -}; - -jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarArgs) { - var el = document.createElement(type); - - for (var i = 2; i < arguments.length; i++) { - var child = arguments[i]; - - if (typeof child === 'string') { - el.appendChild(document.createTextNode(child)); - } else { - if (child) { el.appendChild(child); } - } - } - - for (var attr in attrs) { - if (attr == "className") { - el[attr] = attrs[attr]; - } else { - el.setAttribute(attr, attrs[attr]); - } - } - - return el; -}; - -jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) { - var showPassed, showSkipped; - - this.outerDiv = this.createDom('div', { className: 'jasmine_reporter' }, - this.createDom('div', { className: 'banner' }, - this.createDom('div', { className: 'logo' }, - this.createDom('a', { href: 'http://pivotal.github.com/jasmine/', target: "_blank" }, "Jasmine"), - this.createDom('span', { className: 'version' }, runner.env.versionString())), - this.createDom('div', { className: 'options' }, - "Show ", - showPassed = this.createDom('input', { id: "__jasmine_TrivialReporter_showPassed__", type: 'checkbox' }), - this.createDom('label', { "for": "__jasmine_TrivialReporter_showPassed__" }, " passed "), - showSkipped = this.createDom('input', { id: "__jasmine_TrivialReporter_showSkipped__", type: 'checkbox' }), - this.createDom('label', { "for": "__jasmine_TrivialReporter_showSkipped__" }, " skipped") - ) - ), - - this.runnerDiv = this.createDom('div', { className: 'runner running' }, - this.createDom('a', { className: 'run_spec', href: '?' }, "run all"), - this.runnerMessageSpan = this.createDom('span', {}, "Running..."), - this.finishedAtSpan = this.createDom('span', { className: 'finished-at' }, "")) - ); - - this.document.body.appendChild(this.outerDiv); - - var suites = runner.suites(); - for (var i = 0; i < suites.length; i++) { - var suite = suites[i]; - var suiteDiv = this.createDom('div', { className: 'suite' }, - this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"), - this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description)); - this.suiteDivs[suite.id] = suiteDiv; - var parentDiv = this.outerDiv; - if (suite.parentSuite) { - parentDiv = this.suiteDivs[suite.parentSuite.id]; - } - parentDiv.appendChild(suiteDiv); - } - - this.startedAt = new Date(); - - var self = this; - showPassed.onclick = function(evt) { - if (showPassed.checked) { - self.outerDiv.className += ' show-passed'; - } else { - self.outerDiv.className = self.outerDiv.className.replace(/ show-passed/, ''); - } - }; - - showSkipped.onclick = function(evt) { - if (showSkipped.checked) { - self.outerDiv.className += ' show-skipped'; - } else { - self.outerDiv.className = self.outerDiv.className.replace(/ show-skipped/, ''); - } - }; -}; - -jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) { - var results = runner.results(); - var className = (results.failedCount > 0) ? "runner failed" : "runner passed"; - this.runnerDiv.setAttribute("class", className); - //do it twice for IE - this.runnerDiv.setAttribute("className", className); - var specs = runner.specs(); - var specCount = 0; - for (var i = 0; i < specs.length; i++) { - if (this.specFilter(specs[i])) { - specCount++; - } - } - var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s"); - message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s"; - this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild); - - this.finishedAtSpan.appendChild(document.createTextNode("Finished at " + new Date().toString())); -}; - -jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) { - var results = suite.results(); - var status = results.passed() ? 'passed' : 'failed'; - if (results.totalCount == 0) { // todo: change this to check results.skipped - status = 'skipped'; - } - this.suiteDivs[suite.id].className += " " + status; -}; - -jasmine.TrivialReporter.prototype.reportSpecStarting = function(spec) { - if (this.logRunningSpecs) { - this.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...'); - } -}; - -jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) { - var results = spec.results(); - var status = results.passed() ? 'passed' : 'failed'; - if (results.skipped) { - status = 'skipped'; - } - var specDiv = this.createDom('div', { className: 'spec ' + status }, - this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"), - this.createDom('a', { - className: 'description', - href: '?spec=' + encodeURIComponent(spec.getFullName()), - title: spec.getFullName() - }, spec.description)); - - - var resultItems = results.getItems(); - var messagesDiv = this.createDom('div', { className: 'messages' }); - for (var i = 0; i < resultItems.length; i++) { - var result = resultItems[i]; - - if (result.type == 'log') { - messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString())); - } else if (result.type == 'expect' && result.passed && !result.passed()) { - messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message)); - - if (result.trace.stack) { - messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack)); - } - } - } - - if (messagesDiv.childNodes.length > 0) { - specDiv.appendChild(messagesDiv); - } - - this.suiteDivs[spec.suite.id].appendChild(specDiv); -}; - -jasmine.TrivialReporter.prototype.log = function() { - var console = jasmine.getGlobal().console; - if (console && console.log) { - if (console.log.apply) { - console.log.apply(console, arguments); - } else { - console.log(arguments); // ie fix: console.log.apply doesn't exist on ie - } - } -}; - -jasmine.TrivialReporter.prototype.getLocation = function() { - return this.document.location; -}; - -jasmine.TrivialReporter.prototype.specFilter = function(spec) { - var paramMap = {}; - var params = this.getLocation().search.substring(1).split('&'); - for (var i = 0; i < params.length; i++) { - var p = params[i].split('='); - paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]); - } - - if (!paramMap["spec"]) return true; - return spec.getFullName().indexOf(paramMap["spec"]) == 0; -}; diff --git a/external/jasmine-1.0.1/jasmine.css b/external/jasmine-1.0.1/jasmine.css deleted file mode 100644 index 6583fe7c..00000000 --- a/external/jasmine-1.0.1/jasmine.css +++ /dev/null @@ -1,166 +0,0 @@ -body { - font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; -} - - -.jasmine_reporter a:visited, .jasmine_reporter a { - color: #303; -} - -.jasmine_reporter a:hover, .jasmine_reporter a:active { - color: blue; -} - -.run_spec { - float:right; - padding-right: 5px; - font-size: .8em; - text-decoration: none; -} - -.jasmine_reporter { - margin: 0 5px; -} - -.banner { - color: #303; - background-color: #fef; - padding: 5px; -} - -.logo { - float: left; - font-size: 1.1em; - padding-left: 5px; -} - -.logo .version { - font-size: .6em; - padding-left: 1em; -} - -.runner.running { - background-color: yellow; -} - - -.options { - text-align: right; - font-size: .8em; -} - - - - -.suite { - border: 1px outset gray; - margin: 5px 0; - padding-left: 1em; -} - -.suite .suite { - margin: 5px; -} - -.suite.passed { - background-color: #dfd; -} - -.suite.failed { - background-color: #fdd; -} - -.spec { - margin: 5px; - padding-left: 1em; - clear: both; -} - -.spec.failed, .spec.passed, .spec.skipped { - padding-bottom: 5px; - border: 1px solid gray; -} - -.spec.failed { - background-color: #fbb; - border-color: red; -} - -.spec.passed { - background-color: #bfb; - border-color: green; -} - -.spec.skipped { - background-color: #bbb; -} - -.messages { - border-left: 1px dashed gray; - padding-left: 1em; - padding-right: 1em; -} - -.passed { - background-color: #cfc; - display: none; -} - -.failed { - background-color: #fbb; -} - -.skipped { - color: #777; - background-color: #eee; - display: none; -} - - -/*.resultMessage {*/ - /*white-space: pre;*/ -/*}*/ - -.resultMessage span.result { - display: block; - line-height: 2em; - color: black; -} - -.resultMessage .mismatch { - color: black; -} - -.stackTrace { - white-space: pre; - font-size: .8em; - margin-left: 10px; - max-height: 5em; - overflow: auto; - border: 1px inset red; - padding: 1em; - background: #eef; -} - -.finished-at { - padding-left: 1em; - font-size: .6em; -} - -.show-passed .passed, -.show-skipped .skipped { - display: block; -} - - -#jasmine_content { - position:fixed; - right: 100%; -} - -.runner { - border: 1px solid gray; - display: block; - margin: 5px 0; - padding: 2px 0 2px 10px; -} diff --git a/external/jasmine-1.0.1/jasmine.js b/external/jasmine-1.0.1/jasmine.js deleted file mode 100644 index 964f99ed..00000000 --- a/external/jasmine-1.0.1/jasmine.js +++ /dev/null @@ -1,2421 +0,0 @@ -/** - * Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework. - * - * @namespace - */ -var jasmine = {}; - -/** - * @private - */ -jasmine.unimplementedMethod_ = function() { - throw new Error("unimplemented method"); -}; - -/** - * Use jasmine.undefined instead of undefined, since undefined is just - * a plain old variable and may be redefined by somebody else. - * - * @private - */ -jasmine.undefined = jasmine.___undefined___; - -/** - * Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed. - * - */ -jasmine.DEFAULT_UPDATE_INTERVAL = 250; - -/** - * Default timeout interval in milliseconds for waitsFor() blocks. - */ -jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000; - -jasmine.getGlobal = function() { - function getGlobal() { - return this; - } - - return getGlobal(); -}; - -/** - * Allows for bound functions to be compared. Internal use only. - * - * @ignore - * @private - * @param base {Object} bound 'this' for the function - * @param name {Function} function to find - */ -jasmine.bindOriginal_ = function(base, name) { - var original = base[name]; - if (original.apply) { - return function() { - return original.apply(base, arguments); - }; - } else { - // IE support - return jasmine.getGlobal()[name]; - } -}; - -jasmine.setTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'setTimeout'); -jasmine.clearTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearTimeout'); -jasmine.setInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'setInterval'); -jasmine.clearInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearInterval'); - -jasmine.MessageResult = function(values) { - this.type = 'log'; - this.values = values; - this.trace = new Error(); // todo: test better -}; - -jasmine.MessageResult.prototype.toString = function() { - var text = ""; - for(var i = 0; i < this.values.length; i++) { - if (i > 0) text += " "; - if (jasmine.isString_(this.values[i])) { - text += this.values[i]; - } else { - text += jasmine.pp(this.values[i]); - } - } - return text; -}; - -jasmine.ExpectationResult = function(params) { - this.type = 'expect'; - this.matcherName = params.matcherName; - this.passed_ = params.passed; - this.expected = params.expected; - this.actual = params.actual; - - this.message = this.passed_ ? 'Passed.' : params.message; - this.trace = this.passed_ ? '' : new Error(this.message); -}; - -jasmine.ExpectationResult.prototype.toString = function () { - return this.message; -}; - -jasmine.ExpectationResult.prototype.passed = function () { - return this.passed_; -}; - -/** - * Getter for the Jasmine environment. Ensures one gets created - */ -jasmine.getEnv = function() { - return jasmine.currentEnv_ = jasmine.currentEnv_ || new jasmine.Env(); -}; - -/** - * @ignore - * @private - * @param value - * @returns {Boolean} - */ -jasmine.isArray_ = function(value) { - return jasmine.isA_("Array", value); -}; - -/** - * @ignore - * @private - * @param value - * @returns {Boolean} - */ -jasmine.isString_ = function(value) { - return jasmine.isA_("String", value); -}; - -/** - * @ignore - * @private - * @param value - * @returns {Boolean} - */ -jasmine.isNumber_ = function(value) { - return jasmine.isA_("Number", value); -}; - -/** - * @ignore - * @private - * @param {String} typeName - * @param value - * @returns {Boolean} - */ -jasmine.isA_ = function(typeName, value) { - return Object.prototype.toString.apply(value) === '[object ' + typeName + ']'; -}; - -/** - * Pretty printer for expecations. Takes any object and turns it into a human-readable string. - * - * @param value {Object} an object to be outputted - * @returns {String} - */ -jasmine.pp = function(value) { - var stringPrettyPrinter = new jasmine.StringPrettyPrinter(); - stringPrettyPrinter.format(value); - return stringPrettyPrinter.string; -}; - -/** - * Returns true if the object is a DOM Node. - * - * @param {Object} obj object to check - * @returns {Boolean} - */ -jasmine.isDomNode = function(obj) { - return obj['nodeType'] > 0; -}; - -/** - * Returns a matchable 'generic' object of the class type. For use in expecations of type when values don't matter. - * - * @example - * // don't care about which function is passed in, as long as it's a function - * expect(mySpy).toHaveBeenCalledWith(jasmine.any(Function)); - * - * @param {Class} clazz - * @returns matchable object of the type clazz - */ -jasmine.any = function(clazz) { - return new jasmine.Matchers.Any(clazz); -}; - -/** - * Jasmine Spies are test doubles that can act as stubs, spies, fakes or when used in an expecation, mocks. - * - * Spies should be created in test setup, before expectations. They can then be checked, using the standard Jasmine - * expectation syntax. Spies can be checked if they were called or not and what the calling params were. - * - * A Spy has the following fields: wasCalled, callCount, mostRecentCall, and argsForCall (see docs). - * - * Spies are torn down at the end of every spec. - * - * Note: Do not call new jasmine.Spy() directly - a spy must be created using spyOn, jasmine.createSpy or jasmine.createSpyObj. - * - * @example - * // a stub - * var myStub = jasmine.createSpy('myStub'); // can be used anywhere - * - * // spy example - * var foo = { - * not: function(bool) { return !bool; } - * } - * - * // actual foo.not will not be called, execution stops - * spyOn(foo, 'not'); - - // foo.not spied upon, execution will continue to implementation - * spyOn(foo, 'not').andCallThrough(); - * - * // fake example - * var foo = { - * not: function(bool) { return !bool; } - * } - * - * // foo.not(val) will return val - * spyOn(foo, 'not').andCallFake(function(value) {return value;}); - * - * // mock example - * foo.not(7 == 7); - * expect(foo.not).toHaveBeenCalled(); - * expect(foo.not).toHaveBeenCalledWith(true); - * - * @constructor - * @see spyOn, jasmine.createSpy, jasmine.createSpyObj - * @param {String} name - */ -jasmine.Spy = function(name) { - /** - * The name of the spy, if provided. - */ - this.identity = name || 'unknown'; - /** - * Is this Object a spy? - */ - this.isSpy = true; - /** - * The actual function this spy stubs. - */ - this.plan = function() { - }; - /** - * Tracking of the most recent call to the spy. - * @example - * var mySpy = jasmine.createSpy('foo'); - * mySpy(1, 2); - * mySpy.mostRecentCall.args = [1, 2]; - */ - this.mostRecentCall = {}; - - /** - * Holds arguments for each call to the spy, indexed by call count - * @example - * var mySpy = jasmine.createSpy('foo'); - * mySpy(1, 2); - * mySpy(7, 8); - * mySpy.mostRecentCall.args = [7, 8]; - * mySpy.argsForCall[0] = [1, 2]; - * mySpy.argsForCall[1] = [7, 8]; - */ - this.argsForCall = []; - this.calls = []; -}; - -/** - * Tells a spy to call through to the actual implemenatation. - * - * @example - * var foo = { - * bar: function() { // do some stuff } - * } - * - * // defining a spy on an existing property: foo.bar - * spyOn(foo, 'bar').andCallThrough(); - */ -jasmine.Spy.prototype.andCallThrough = function() { - this.plan = this.originalValue; - return this; -}; - -/** - * For setting the return value of a spy. - * - * @example - * // defining a spy from scratch: foo() returns 'baz' - * var foo = jasmine.createSpy('spy on foo').andReturn('baz'); - * - * // defining a spy on an existing property: foo.bar() returns 'baz' - * spyOn(foo, 'bar').andReturn('baz'); - * - * @param {Object} value - */ -jasmine.Spy.prototype.andReturn = function(value) { - this.plan = function() { - return value; - }; - return this; -}; - -/** - * For throwing an exception when a spy is called. - * - * @example - * // defining a spy from scratch: foo() throws an exception w/ message 'ouch' - * var foo = jasmine.createSpy('spy on foo').andThrow('baz'); - * - * // defining a spy on an existing property: foo.bar() throws an exception w/ message 'ouch' - * spyOn(foo, 'bar').andThrow('baz'); - * - * @param {String} exceptionMsg - */ -jasmine.Spy.prototype.andThrow = function(exceptionMsg) { - this.plan = function() { - throw exceptionMsg; - }; - return this; -}; - -/** - * Calls an alternate implementation when a spy is called. - * - * @example - * var baz = function() { - * // do some stuff, return something - * } - * // defining a spy from scratch: foo() calls the function baz - * var foo = jasmine.createSpy('spy on foo').andCall(baz); - * - * // defining a spy on an existing property: foo.bar() calls an anonymnous function - * spyOn(foo, 'bar').andCall(function() { return 'baz';} ); - * - * @param {Function} fakeFunc - */ -jasmine.Spy.prototype.andCallFake = function(fakeFunc) { - this.plan = fakeFunc; - return this; -}; - -/** - * Resets all of a spy's the tracking variables so that it can be used again. - * - * @example - * spyOn(foo, 'bar'); - * - * foo.bar(); - * - * expect(foo.bar.callCount).toEqual(1); - * - * foo.bar.reset(); - * - * expect(foo.bar.callCount).toEqual(0); - */ -jasmine.Spy.prototype.reset = function() { - this.wasCalled = false; - this.callCount = 0; - this.argsForCall = []; - this.calls = []; - this.mostRecentCall = {}; -}; - -jasmine.createSpy = function(name) { - - var spyObj = function() { - spyObj.wasCalled = true; - spyObj.callCount++; - var args = jasmine.util.argsToArray(arguments); - spyObj.mostRecentCall.object = this; - spyObj.mostRecentCall.args = args; - spyObj.argsForCall.push(args); - spyObj.calls.push({object: this, args: args}); - return spyObj.plan.apply(this, arguments); - }; - - var spy = new jasmine.Spy(name); - - for (var prop in spy) { - spyObj[prop] = spy[prop]; - } - - spyObj.reset(); - - return spyObj; -}; - -/** - * Determines whether an object is a spy. - * - * @param {jasmine.Spy|Object} putativeSpy - * @returns {Boolean} - */ -jasmine.isSpy = function(putativeSpy) { - return putativeSpy && putativeSpy.isSpy; -}; - -/** - * Creates a more complicated spy: an Object that has every property a function that is a spy. Used for stubbing something - * large in one call. - * - * @param {String} baseName name of spy class - * @param {Array} methodNames array of names of methods to make spies - */ -jasmine.createSpyObj = function(baseName, methodNames) { - if (!jasmine.isArray_(methodNames) || methodNames.length == 0) { - throw new Error('createSpyObj requires a non-empty array of method names to create spies for'); - } - var obj = {}; - for (var i = 0; i < methodNames.length; i++) { - obj[methodNames[i]] = jasmine.createSpy(baseName + '.' + methodNames[i]); - } - return obj; -}; - -/** - * All parameters are pretty-printed and concatenated together, then written to the current spec's output. - * - * Be careful not to leave calls to jasmine.log in production code. - */ -jasmine.log = function() { - var spec = jasmine.getEnv().currentSpec; - spec.log.apply(spec, arguments); -}; - -/** - * Function that installs a spy on an existing object's method name. Used within a Spec to create a spy. - * - * @example - * // spy example - * var foo = { - * not: function(bool) { return !bool; } - * } - * spyOn(foo, 'not'); // actual foo.not will not be called, execution stops - * - * @see jasmine.createSpy - * @param obj - * @param methodName - * @returns a Jasmine spy that can be chained with all spy methods - */ -var spyOn = function(obj, methodName) { - return jasmine.getEnv().currentSpec.spyOn(obj, methodName); -}; - -/** - * Creates a Jasmine spec that will be added to the current suite. - * - * // TODO: pending tests - * - * @example - * it('should be true', function() { - * expect(true).toEqual(true); - * }); - * - * @param {String} desc description of this specification - * @param {Function} func defines the preconditions and expectations of the spec - */ -var it = function(desc, func) { - return jasmine.getEnv().it(desc, func); -}; - -/** - * Creates a disabled Jasmine spec. - * - * A convenience method that allows existing specs to be disabled temporarily during development. - * - * @param {String} desc description of this specification - * @param {Function} func defines the preconditions and expectations of the spec - */ -var xit = function(desc, func) { - return jasmine.getEnv().xit(desc, func); -}; - -/** - * Starts a chain for a Jasmine expectation. - * - * It is passed an Object that is the actual value and should chain to one of the many - * jasmine.Matchers functions. - * - * @param {Object} actual Actual value to test against and expected value - */ -var expect = function(actual) { - return jasmine.getEnv().currentSpec.expect(actual); -}; - -/** - * Defines part of a jasmine spec. Used in cominbination with waits or waitsFor in asynchrnous specs. - * - * @param {Function} func Function that defines part of a jasmine spec. - */ -var runs = function(func) { - jasmine.getEnv().currentSpec.runs(func); -}; - -/** - * Waits a fixed time period before moving to the next block. - * - * @deprecated Use waitsFor() instead - * @param {Number} timeout milliseconds to wait - */ -var waits = function(timeout) { - jasmine.getEnv().currentSpec.waits(timeout); -}; - -/** - * Waits for the latchFunction to return true before proceeding to the next block. - * - * @param {Function} latchFunction - * @param {String} optional_timeoutMessage - * @param {Number} optional_timeout - */ -var waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) { - jasmine.getEnv().currentSpec.waitsFor.apply(jasmine.getEnv().currentSpec, arguments); -}; - -/** - * A function that is called before each spec in a suite. - * - * Used for spec setup, including validating assumptions. - * - * @param {Function} beforeEachFunction - */ -var beforeEach = function(beforeEachFunction) { - jasmine.getEnv().beforeEach(beforeEachFunction); -}; - -/** - * A function that is called after each spec in a suite. - * - * Used for restoring any state that is hijacked during spec execution. - * - * @param {Function} afterEachFunction - */ -var afterEach = function(afterEachFunction) { - jasmine.getEnv().afterEach(afterEachFunction); -}; - -/** - * Defines a suite of specifications. - * - * Stores the description and all defined specs in the Jasmine environment as one suite of specs. Variables declared - * are accessible by calls to beforeEach, it, and afterEach. Describe blocks can be nested, allowing for specialization - * of setup in some tests. - * - * @example - * // TODO: a simple suite - * - * // TODO: a simple suite with a nested describe block - * - * @param {String} description A string, usually the class under test. - * @param {Function} specDefinitions function that defines several specs. - */ -var describe = function(description, specDefinitions) { - return jasmine.getEnv().describe(description, specDefinitions); -}; - -/** - * Disables a suite of specifications. Used to disable some suites in a file, or files, temporarily during development. - * - * @param {String} description A string, usually the class under test. - * @param {Function} specDefinitions function that defines several specs. - */ -var xdescribe = function(description, specDefinitions) { - return jasmine.getEnv().xdescribe(description, specDefinitions); -}; - - -// Provide the XMLHttpRequest class for IE 5.x-6.x: -jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() { - try { - return new ActiveXObject("Msxml2.XMLHTTP.6.0"); - } catch(e) { - } - try { - return new ActiveXObject("Msxml2.XMLHTTP.3.0"); - } catch(e) { - } - try { - return new ActiveXObject("Msxml2.XMLHTTP"); - } catch(e) { - } - try { - return new ActiveXObject("Microsoft.XMLHTTP"); - } catch(e) { - } - throw new Error("This browser does not support XMLHttpRequest."); -} : XMLHttpRequest; -/** - * @namespace - */ -jasmine.util = {}; - -/** - * Declare that a child class inherit it's prototype from the parent class. - * - * @private - * @param {Function} childClass - * @param {Function} parentClass - */ -jasmine.util.inherit = function(childClass, parentClass) { - /** - * @private - */ - var subclass = function() { - }; - subclass.prototype = parentClass.prototype; - childClass.prototype = new subclass; -}; - -jasmine.util.formatException = function(e) { - var lineNumber; - if (e.line) { - lineNumber = e.line; - } - else if (e.lineNumber) { - lineNumber = e.lineNumber; - } - - var file; - - if (e.sourceURL) { - file = e.sourceURL; - } - else if (e.fileName) { - file = e.fileName; - } - - var message = (e.name && e.message) ? (e.name + ': ' + e.message) : e.toString(); - - if (file && lineNumber) { - message += ' in ' + file + ' (line ' + lineNumber + ')'; - } - - return message; -}; - -jasmine.util.htmlEscape = function(str) { - if (!str) return str; - return str.replace(/&/g, '&') - .replace(//g, '>'); -}; - -jasmine.util.argsToArray = function(args) { - var arrayOfArgs = []; - for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]); - return arrayOfArgs; -}; - -jasmine.util.extend = function(destination, source) { - for (var property in source) destination[property] = source[property]; - return destination; -}; - -/** - * Environment for Jasmine - * - * @constructor - */ -jasmine.Env = function() { - this.currentSpec = null; - this.currentSuite = null; - this.currentRunner_ = new jasmine.Runner(this); - - this.reporter = new jasmine.MultiReporter(); - - this.updateInterval = jasmine.DEFAULT_UPDATE_INTERVAL; - this.defaultTimeoutInterval = jasmine.DEFAULT_TIMEOUT_INTERVAL; - this.lastUpdate = 0; - this.specFilter = function() { - return true; - }; - - this.nextSpecId_ = 0; - this.nextSuiteId_ = 0; - this.equalityTesters_ = []; - - // wrap matchers - this.matchersClass = function() { - jasmine.Matchers.apply(this, arguments); - }; - jasmine.util.inherit(this.matchersClass, jasmine.Matchers); - - jasmine.Matchers.wrapInto_(jasmine.Matchers.prototype, this.matchersClass); -}; - - -jasmine.Env.prototype.setTimeout = jasmine.setTimeout; -jasmine.Env.prototype.clearTimeout = jasmine.clearTimeout; -jasmine.Env.prototype.setInterval = jasmine.setInterval; -jasmine.Env.prototype.clearInterval = jasmine.clearInterval; - -/** - * @returns an object containing jasmine version build info, if set. - */ -jasmine.Env.prototype.version = function () { - if (jasmine.version_) { - return jasmine.version_; - } else { - throw new Error('Version not set'); - } -}; - -/** - * @returns string containing jasmine version build info, if set. - */ -jasmine.Env.prototype.versionString = function() { - if (jasmine.version_) { - var version = this.version(); - return version.major + "." + version.minor + "." + version.build + " revision " + version.revision; - } else { - return "version unknown"; - } -}; - -/** - * @returns a sequential integer starting at 0 - */ -jasmine.Env.prototype.nextSpecId = function () { - return this.nextSpecId_++; -}; - -/** - * @returns a sequential integer starting at 0 - */ -jasmine.Env.prototype.nextSuiteId = function () { - return this.nextSuiteId_++; -}; - -/** - * Register a reporter to receive status updates from Jasmine. - * @param {jasmine.Reporter} reporter An object which will receive status updates. - */ -jasmine.Env.prototype.addReporter = function(reporter) { - this.reporter.addReporter(reporter); -}; - -jasmine.Env.prototype.execute = function() { - this.currentRunner_.execute(); -}; - -jasmine.Env.prototype.describe = function(description, specDefinitions) { - var suite = new jasmine.Suite(this, description, specDefinitions, this.currentSuite); - - var parentSuite = this.currentSuite; - if (parentSuite) { - parentSuite.add(suite); - } else { - this.currentRunner_.add(suite); - } - - this.currentSuite = suite; - - var declarationError = null; - try { - specDefinitions.call(suite); - } catch(e) { - declarationError = e; - } - - this.currentSuite = parentSuite; - - if (declarationError) { - this.it("encountered a declaration exception", function() { - throw declarationError; - }); - } - - return suite; -}; - -jasmine.Env.prototype.beforeEach = function(beforeEachFunction) { - if (this.currentSuite) { - this.currentSuite.beforeEach(beforeEachFunction); - } else { - this.currentRunner_.beforeEach(beforeEachFunction); - } -}; - -jasmine.Env.prototype.currentRunner = function () { - return this.currentRunner_; -}; - -jasmine.Env.prototype.afterEach = function(afterEachFunction) { - if (this.currentSuite) { - this.currentSuite.afterEach(afterEachFunction); - } else { - this.currentRunner_.afterEach(afterEachFunction); - } - -}; - -jasmine.Env.prototype.xdescribe = function(desc, specDefinitions) { - return { - execute: function() { - } - }; -}; - -jasmine.Env.prototype.it = function(description, func) { - var spec = new jasmine.Spec(this, this.currentSuite, description); - this.currentSuite.add(spec); - this.currentSpec = spec; - - if (func) { - spec.runs(func); - } - - return spec; -}; - -jasmine.Env.prototype.xit = function(desc, func) { - return { - id: this.nextSpecId(), - runs: function() { - } - }; -}; - -jasmine.Env.prototype.compareObjects_ = function(a, b, mismatchKeys, mismatchValues) { - if (a.__Jasmine_been_here_before__ === b && b.__Jasmine_been_here_before__ === a) { - return true; - } - - a.__Jasmine_been_here_before__ = b; - b.__Jasmine_been_here_before__ = a; - - var hasKey = function(obj, keyName) { - return obj != null && obj[keyName] !== jasmine.undefined; - }; - - for (var property in b) { - if (!hasKey(a, property) && hasKey(b, property)) { - mismatchKeys.push("expected has key '" + property + "', but missing from actual."); - } - } - for (property in a) { - if (!hasKey(b, property) && hasKey(a, property)) { - mismatchKeys.push("expected missing key '" + property + "', but present in actual."); - } - } - for (property in b) { - if (property == '__Jasmine_been_here_before__') continue; - if (!this.equals_(a[property], b[property], mismatchKeys, mismatchValues)) { - mismatchValues.push("'" + property + "' was '" + (b[property] ? jasmine.util.htmlEscape(b[property].toString()) : b[property]) + "' in expected, but was '" + (a[property] ? jasmine.util.htmlEscape(a[property].toString()) : a[property]) + "' in actual."); - } - } - - if (jasmine.isArray_(a) && jasmine.isArray_(b) && a.length != b.length) { - mismatchValues.push("arrays were not the same length"); - } - - delete a.__Jasmine_been_here_before__; - delete b.__Jasmine_been_here_before__; - return (mismatchKeys.length == 0 && mismatchValues.length == 0); -}; - -jasmine.Env.prototype.equals_ = function(a, b, mismatchKeys, mismatchValues) { - mismatchKeys = mismatchKeys || []; - mismatchValues = mismatchValues || []; - - for (var i = 0; i < this.equalityTesters_.length; i++) { - var equalityTester = this.equalityTesters_[i]; - var result = equalityTester(a, b, this, mismatchKeys, mismatchValues); - if (result !== jasmine.undefined) return result; - } - - if (a === b) return true; - - if (a === jasmine.undefined || a === null || b === jasmine.undefined || b === null) { - return (a == jasmine.undefined && b == jasmine.undefined); - } - - if (jasmine.isDomNode(a) && jasmine.isDomNode(b)) { - return a === b; - } - - if (a instanceof Date && b instanceof Date) { - return a.getTime() == b.getTime(); - } - - if (a instanceof jasmine.Matchers.Any) { - return a.matches(b); - } - - if (b instanceof jasmine.Matchers.Any) { - return b.matches(a); - } - - if (jasmine.isString_(a) && jasmine.isString_(b)) { - return (a == b); - } - - if (jasmine.isNumber_(a) && jasmine.isNumber_(b)) { - return (a == b); - } - - if (typeof a === "object" && typeof b === "object") { - return this.compareObjects_(a, b, mismatchKeys, mismatchValues); - } - - //Straight check - return (a === b); -}; - -jasmine.Env.prototype.contains_ = function(haystack, needle) { - if (jasmine.isArray_(haystack)) { - for (var i = 0; i < haystack.length; i++) { - if (this.equals_(haystack[i], needle)) return true; - } - return false; - } - return haystack.indexOf(needle) >= 0; -}; - -jasmine.Env.prototype.addEqualityTester = function(equalityTester) { - this.equalityTesters_.push(equalityTester); -}; -/** No-op base class for Jasmine reporters. - * - * @constructor - */ -jasmine.Reporter = function() { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportRunnerStarting = function(runner) { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportRunnerResults = function(runner) { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportSuiteResults = function(suite) { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportSpecStarting = function(spec) { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportSpecResults = function(spec) { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.log = function(str) { -}; - -/** - * Blocks are functions with executable code that make up a spec. - * - * @constructor - * @param {jasmine.Env} env - * @param {Function} func - * @param {jasmine.Spec} spec - */ -jasmine.Block = function(env, func, spec) { - this.env = env; - this.func = func; - this.spec = spec; -}; - -jasmine.Block.prototype.execute = function(onComplete) { - try { - this.func.apply(this.spec); - } catch (e) { - this.spec.fail(e); - } - onComplete(); -}; -/** JavaScript API reporter. - * - * @constructor - */ -jasmine.JsApiReporter = function() { - this.started = false; - this.finished = false; - this.suites_ = []; - this.results_ = {}; -}; - -jasmine.JsApiReporter.prototype.reportRunnerStarting = function(runner) { - this.started = true; - var suites = runner.topLevelSuites(); - for (var i = 0; i < suites.length; i++) { - var suite = suites[i]; - this.suites_.push(this.summarize_(suite)); - } -}; - -jasmine.JsApiReporter.prototype.suites = function() { - return this.suites_; -}; - -jasmine.JsApiReporter.prototype.summarize_ = function(suiteOrSpec) { - var isSuite = suiteOrSpec instanceof jasmine.Suite; - var summary = { - id: suiteOrSpec.id, - name: suiteOrSpec.description, - type: isSuite ? 'suite' : 'spec', - children: [] - }; - - if (isSuite) { - var children = suiteOrSpec.children(); - for (var i = 0; i < children.length; i++) { - summary.children.push(this.summarize_(children[i])); - } - } - return summary; -}; - -jasmine.JsApiReporter.prototype.results = function() { - return this.results_; -}; - -jasmine.JsApiReporter.prototype.resultsForSpec = function(specId) { - return this.results_[specId]; -}; - -//noinspection JSUnusedLocalSymbols -jasmine.JsApiReporter.prototype.reportRunnerResults = function(runner) { - this.finished = true; -}; - -//noinspection JSUnusedLocalSymbols -jasmine.JsApiReporter.prototype.reportSuiteResults = function(suite) { -}; - -//noinspection JSUnusedLocalSymbols -jasmine.JsApiReporter.prototype.reportSpecResults = function(spec) { - this.results_[spec.id] = { - messages: spec.results().getItems(), - result: spec.results().failedCount > 0 ? "failed" : "passed" - }; -}; - -//noinspection JSUnusedLocalSymbols -jasmine.JsApiReporter.prototype.log = function(str) { -}; - -jasmine.JsApiReporter.prototype.resultsForSpecs = function(specIds){ - var results = {}; - for (var i = 0; i < specIds.length; i++) { - var specId = specIds[i]; - results[specId] = this.summarizeResult_(this.results_[specId]); - } - return results; -}; - -jasmine.JsApiReporter.prototype.summarizeResult_ = function(result){ - var summaryMessages = []; - var messagesLength = result.messages.length; - for (var messageIndex = 0; messageIndex < messagesLength; messageIndex++) { - var resultMessage = result.messages[messageIndex]; - summaryMessages.push({ - text: resultMessage.type == 'log' ? resultMessage.toString() : jasmine.undefined, - passed: resultMessage.passed ? resultMessage.passed() : true, - type: resultMessage.type, - message: resultMessage.message, - trace: { - stack: resultMessage.passed && !resultMessage.passed() ? resultMessage.trace.stack : jasmine.undefined - } - }); - } - - return { - result : result.result, - messages : summaryMessages - }; -}; - -/** - * @constructor - * @param {jasmine.Env} env - * @param actual - * @param {jasmine.Spec} spec - */ -jasmine.Matchers = function(env, actual, spec, opt_isNot) { - this.env = env; - this.actual = actual; - this.spec = spec; - this.isNot = opt_isNot || false; - this.reportWasCalled_ = false; -}; - -// todo: @deprecated as of Jasmine 0.11, remove soon [xw] -jasmine.Matchers.pp = function(str) { - throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!"); -}; - -// todo: @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. [xw] -jasmine.Matchers.prototype.report = function(result, failing_message, details) { - throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs"); -}; - -jasmine.Matchers.wrapInto_ = function(prototype, matchersClass) { - for (var methodName in prototype) { - if (methodName == 'report') continue; - var orig = prototype[methodName]; - matchersClass.prototype[methodName] = jasmine.Matchers.matcherFn_(methodName, orig); - } -}; - -jasmine.Matchers.matcherFn_ = function(matcherName, matcherFunction) { - return function() { - var matcherArgs = jasmine.util.argsToArray(arguments); - var result = matcherFunction.apply(this, arguments); - - if (this.isNot) { - result = !result; - } - - if (this.reportWasCalled_) return result; - - var message; - if (!result) { - if (this.message) { - message = this.message.apply(this, arguments); - if (jasmine.isArray_(message)) { - message = message[this.isNot ? 1 : 0]; - } - } else { - var englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); }); - message = "Expected " + jasmine.pp(this.actual) + (this.isNot ? " not " : " ") + englishyPredicate; - if (matcherArgs.length > 0) { - for (var i = 0; i < matcherArgs.length; i++) { - if (i > 0) message += ","; - message += " " + jasmine.pp(matcherArgs[i]); - } - } - message += "."; - } - } - var expectationResult = new jasmine.ExpectationResult({ - matcherName: matcherName, - passed: result, - expected: matcherArgs.length > 1 ? matcherArgs : matcherArgs[0], - actual: this.actual, - message: message - }); - this.spec.addMatcherResult(expectationResult); - return jasmine.undefined; - }; -}; - - - - -/** - * toBe: compares the actual to the expected using === - * @param expected - */ -jasmine.Matchers.prototype.toBe = function(expected) { - return this.actual === expected; -}; - -/** - * toNotBe: compares the actual to the expected using !== - * @param expected - * @deprecated as of 1.0. Use not.toBe() instead. - */ -jasmine.Matchers.prototype.toNotBe = function(expected) { - return this.actual !== expected; -}; - -/** - * toEqual: compares the actual to the expected using common sense equality. Handles Objects, Arrays, etc. - * - * @param expected - */ -jasmine.Matchers.prototype.toEqual = function(expected) { - return this.env.equals_(this.actual, expected); -}; - -/** - * toNotEqual: compares the actual to the expected using the ! of jasmine.Matchers.toEqual - * @param expected - * @deprecated as of 1.0. Use not.toNotEqual() instead. - */ -jasmine.Matchers.prototype.toNotEqual = function(expected) { - return !this.env.equals_(this.actual, expected); -}; - -/** - * Matcher that compares the actual to the expected using a regular expression. Constructs a RegExp, so takes - * a pattern or a String. - * - * @param expected - */ -jasmine.Matchers.prototype.toMatch = function(expected) { - return new RegExp(expected).test(this.actual); -}; - -/** - * Matcher that compares the actual to the expected using the boolean inverse of jasmine.Matchers.toMatch - * @param expected - * @deprecated as of 1.0. Use not.toMatch() instead. - */ -jasmine.Matchers.prototype.toNotMatch = function(expected) { - return !(new RegExp(expected).test(this.actual)); -}; - -/** - * Matcher that compares the actual to jasmine.undefined. - */ -jasmine.Matchers.prototype.toBeDefined = function() { - return (this.actual !== jasmine.undefined); -}; - -/** - * Matcher that compares the actual to jasmine.undefined. - */ -jasmine.Matchers.prototype.toBeUndefined = function() { - return (this.actual === jasmine.undefined); -}; - -/** - * Matcher that compares the actual to null. - */ -jasmine.Matchers.prototype.toBeNull = function() { - return (this.actual === null); -}; - -/** - * Matcher that boolean not-nots the actual. - */ -jasmine.Matchers.prototype.toBeTruthy = function() { - return !!this.actual; -}; - - -/** - * Matcher that boolean nots the actual. - */ -jasmine.Matchers.prototype.toBeFalsy = function() { - return !this.actual; -}; - - -/** - * Matcher that checks to see if the actual, a Jasmine spy, was called. - */ -jasmine.Matchers.prototype.toHaveBeenCalled = function() { - if (arguments.length > 0) { - throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith'); - } - - if (!jasmine.isSpy(this.actual)) { - throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); - } - - this.message = function() { - return [ - "Expected spy " + this.actual.identity + " to have been called.", - "Expected spy " + this.actual.identity + " not to have been called." - ]; - }; - - return this.actual.wasCalled; -}; - -/** @deprecated Use expect(xxx).toHaveBeenCalled() instead */ -jasmine.Matchers.prototype.wasCalled = jasmine.Matchers.prototype.toHaveBeenCalled; - -/** - * Matcher that checks to see if the actual, a Jasmine spy, was not called. - * - * @deprecated Use expect(xxx).not.toHaveBeenCalled() instead - */ -jasmine.Matchers.prototype.wasNotCalled = function() { - if (arguments.length > 0) { - throw new Error('wasNotCalled does not take arguments'); - } - - if (!jasmine.isSpy(this.actual)) { - throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); - } - - this.message = function() { - return [ - "Expected spy " + this.actual.identity + " to not have been called.", - "Expected spy " + this.actual.identity + " to have been called." - ]; - }; - - return !this.actual.wasCalled; -}; - -/** - * Matcher that checks to see if the actual, a Jasmine spy, was called with a set of parameters. - * - * @example - * - */ -jasmine.Matchers.prototype.toHaveBeenCalledWith = function() { - var expectedArgs = jasmine.util.argsToArray(arguments); - if (!jasmine.isSpy(this.actual)) { - throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); - } - this.message = function() { - if (this.actual.callCount == 0) { - // todo: what should the failure message for .not.toHaveBeenCalledWith() be? is this right? test better. [xw] - return [ - "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.", - "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was." - ]; - } else { - return [ - "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall), - "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall) - ]; - } - }; - - return this.env.contains_(this.actual.argsForCall, expectedArgs); -}; - -/** @deprecated Use expect(xxx).toHaveBeenCalledWith() instead */ -jasmine.Matchers.prototype.wasCalledWith = jasmine.Matchers.prototype.toHaveBeenCalledWith; - -/** @deprecated Use expect(xxx).not.toHaveBeenCalledWith() instead */ -jasmine.Matchers.prototype.wasNotCalledWith = function() { - var expectedArgs = jasmine.util.argsToArray(arguments); - if (!jasmine.isSpy(this.actual)) { - throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); - } - - this.message = function() { - return [ - "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was", - "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was" - ] - }; - - return !this.env.contains_(this.actual.argsForCall, expectedArgs); -}; - -/** - * Matcher that checks that the expected item is an element in the actual Array. - * - * @param {Object} expected - */ -jasmine.Matchers.prototype.toContain = function(expected) { - return this.env.contains_(this.actual, expected); -}; - -/** - * Matcher that checks that the expected item is NOT an element in the actual Array. - * - * @param {Object} expected - * @deprecated as of 1.0. Use not.toNotContain() instead. - */ -jasmine.Matchers.prototype.toNotContain = function(expected) { - return !this.env.contains_(this.actual, expected); -}; - -jasmine.Matchers.prototype.toBeLessThan = function(expected) { - return this.actual < expected; -}; - -jasmine.Matchers.prototype.toBeGreaterThan = function(expected) { - return this.actual > expected; -}; - -/** - * Matcher that checks that the expected exception was thrown by the actual. - * - * @param {String} expected - */ -jasmine.Matchers.prototype.toThrow = function(expected) { - var result = false; - var exception; - if (typeof this.actual != 'function') { - throw new Error('Actual is not a function'); - } - try { - this.actual(); - } catch (e) { - exception = e; - } - if (exception) { - result = (expected === jasmine.undefined || this.env.equals_(exception.message || exception, expected.message || expected)); - } - - var not = this.isNot ? "not " : ""; - - this.message = function() { - if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) { - return ["Expected function " + not + "to throw", expected ? expected.message || expected : " an exception", ", but it threw", exception.message || exception].join(' '); - } else { - return "Expected function to throw an exception."; - } - }; - - return result; -}; - -jasmine.Matchers.Any = function(expectedClass) { - this.expectedClass = expectedClass; -}; - -jasmine.Matchers.Any.prototype.matches = function(other) { - if (this.expectedClass == String) { - return typeof other == 'string' || other instanceof String; - } - - if (this.expectedClass == Number) { - return typeof other == 'number' || other instanceof Number; - } - - if (this.expectedClass == Function) { - return typeof other == 'function' || other instanceof Function; - } - - if (this.expectedClass == Object) { - return typeof other == 'object'; - } - - return other instanceof this.expectedClass; -}; - -jasmine.Matchers.Any.prototype.toString = function() { - return ''; -}; - -/** - * @constructor - */ -jasmine.MultiReporter = function() { - this.subReporters_ = []; -}; -jasmine.util.inherit(jasmine.MultiReporter, jasmine.Reporter); - -jasmine.MultiReporter.prototype.addReporter = function(reporter) { - this.subReporters_.push(reporter); -}; - -(function() { - var functionNames = [ - "reportRunnerStarting", - "reportRunnerResults", - "reportSuiteResults", - "reportSpecStarting", - "reportSpecResults", - "log" - ]; - for (var i = 0; i < functionNames.length; i++) { - var functionName = functionNames[i]; - jasmine.MultiReporter.prototype[functionName] = (function(functionName) { - return function() { - for (var j = 0; j < this.subReporters_.length; j++) { - var subReporter = this.subReporters_[j]; - if (subReporter[functionName]) { - subReporter[functionName].apply(subReporter, arguments); - } - } - }; - })(functionName); - } -})(); -/** - * Holds results for a set of Jasmine spec. Allows for the results array to hold another jasmine.NestedResults - * - * @constructor - */ -jasmine.NestedResults = function() { - /** - * The total count of results - */ - this.totalCount = 0; - /** - * Number of passed results - */ - this.passedCount = 0; - /** - * Number of failed results - */ - this.failedCount = 0; - /** - * Was this suite/spec skipped? - */ - this.skipped = false; - /** - * @ignore - */ - this.items_ = []; -}; - -/** - * Roll up the result counts. - * - * @param result - */ -jasmine.NestedResults.prototype.rollupCounts = function(result) { - this.totalCount += result.totalCount; - this.passedCount += result.passedCount; - this.failedCount += result.failedCount; -}; - -/** - * Adds a log message. - * @param values Array of message parts which will be concatenated later. - */ -jasmine.NestedResults.prototype.log = function(values) { - this.items_.push(new jasmine.MessageResult(values)); -}; - -/** - * Getter for the results: message & results. - */ -jasmine.NestedResults.prototype.getItems = function() { - return this.items_; -}; - -/** - * Adds a result, tracking counts (total, passed, & failed) - * @param {jasmine.ExpectationResult|jasmine.NestedResults} result - */ -jasmine.NestedResults.prototype.addResult = function(result) { - if (result.type != 'log') { - if (result.items_) { - this.rollupCounts(result); - } else { - this.totalCount++; - if (result.passed()) { - this.passedCount++; - } else { - this.failedCount++; - } - } - } - this.items_.push(result); -}; - -/** - * @returns {Boolean} True if everything below passed - */ -jasmine.NestedResults.prototype.passed = function() { - return this.passedCount === this.totalCount; -}; -/** - * Base class for pretty printing for expectation results. - */ -jasmine.PrettyPrinter = function() { - this.ppNestLevel_ = 0; -}; - -/** - * Formats a value in a nice, human-readable string. - * - * @param value - */ -jasmine.PrettyPrinter.prototype.format = function(value) { - if (this.ppNestLevel_ > 40) { - throw new Error('jasmine.PrettyPrinter: format() nested too deeply!'); - } - - this.ppNestLevel_++; - try { - if (value === jasmine.undefined) { - this.emitScalar('undefined'); - } else if (value === null) { - this.emitScalar('null'); - } else if (value === jasmine.getGlobal()) { - this.emitScalar(''); - } else if (value instanceof jasmine.Matchers.Any) { - this.emitScalar(value.toString()); - } else if (typeof value === 'string') { - this.emitString(value); - } else if (jasmine.isSpy(value)) { - this.emitScalar("spy on " + value.identity); - } else if (value instanceof RegExp) { - this.emitScalar(value.toString()); - } else if (typeof value === 'function') { - this.emitScalar('Function'); - } else if (typeof value.nodeType === 'number') { - this.emitScalar('HTMLNode'); - } else if (value instanceof Date) { - this.emitScalar('Date(' + value + ')'); - } else if (value.__Jasmine_been_here_before__) { - this.emitScalar(''); - } else if (jasmine.isArray_(value) || typeof value == 'object') { - value.__Jasmine_been_here_before__ = true; - if (jasmine.isArray_(value)) { - this.emitArray(value); - } else { - this.emitObject(value); - } - delete value.__Jasmine_been_here_before__; - } else { - this.emitScalar(value.toString()); - } - } finally { - this.ppNestLevel_--; - } -}; - -jasmine.PrettyPrinter.prototype.iterateObject = function(obj, fn) { - for (var property in obj) { - if (property == '__Jasmine_been_here_before__') continue; - fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) != null) : false); - } -}; - -jasmine.PrettyPrinter.prototype.emitArray = jasmine.unimplementedMethod_; -jasmine.PrettyPrinter.prototype.emitObject = jasmine.unimplementedMethod_; -jasmine.PrettyPrinter.prototype.emitScalar = jasmine.unimplementedMethod_; -jasmine.PrettyPrinter.prototype.emitString = jasmine.unimplementedMethod_; - -jasmine.StringPrettyPrinter = function() { - jasmine.PrettyPrinter.call(this); - - this.string = ''; -}; -jasmine.util.inherit(jasmine.StringPrettyPrinter, jasmine.PrettyPrinter); - -jasmine.StringPrettyPrinter.prototype.emitScalar = function(value) { - this.append(value); -}; - -jasmine.StringPrettyPrinter.prototype.emitString = function(value) { - this.append("'" + value + "'"); -}; - -jasmine.StringPrettyPrinter.prototype.emitArray = function(array) { - this.append('[ '); - for (var i = 0; i < array.length; i++) { - if (i > 0) { - this.append(', '); - } - this.format(array[i]); - } - this.append(' ]'); -}; - -jasmine.StringPrettyPrinter.prototype.emitObject = function(obj) { - var self = this; - this.append('{ '); - var first = true; - - this.iterateObject(obj, function(property, isGetter) { - if (first) { - first = false; - } else { - self.append(', '); - } - - self.append(property); - self.append(' : '); - if (isGetter) { - self.append(''); - } else { - self.format(obj[property]); - } - }); - - this.append(' }'); -}; - -jasmine.StringPrettyPrinter.prototype.append = function(value) { - this.string += value; -}; -jasmine.Queue = function(env) { - this.env = env; - this.blocks = []; - this.running = false; - this.index = 0; - this.offset = 0; - this.abort = false; -}; - -jasmine.Queue.prototype.addBefore = function(block) { - this.blocks.unshift(block); -}; - -jasmine.Queue.prototype.add = function(block) { - this.blocks.push(block); -}; - -jasmine.Queue.prototype.insertNext = function(block) { - this.blocks.splice((this.index + this.offset + 1), 0, block); - this.offset++; -}; - -jasmine.Queue.prototype.start = function(onComplete) { - this.running = true; - this.onComplete = onComplete; - this.next_(); -}; - -jasmine.Queue.prototype.isRunning = function() { - return this.running; -}; - -jasmine.Queue.LOOP_DONT_RECURSE = true; - -jasmine.Queue.prototype.next_ = function() { - var self = this; - var goAgain = true; - - while (goAgain) { - goAgain = false; - - if (self.index < self.blocks.length && !this.abort) { - var calledSynchronously = true; - var completedSynchronously = false; - - var onComplete = function () { - if (jasmine.Queue.LOOP_DONT_RECURSE && calledSynchronously) { - completedSynchronously = true; - return; - } - - if (self.blocks[self.index].abort) { - self.abort = true; - } - - self.offset = 0; - self.index++; - - var now = new Date().getTime(); - if (self.env.updateInterval && now - self.env.lastUpdate > self.env.updateInterval) { - self.env.lastUpdate = now; - self.env.setTimeout(function() { - self.next_(); - }, 0); - } else { - if (jasmine.Queue.LOOP_DONT_RECURSE && completedSynchronously) { - goAgain = true; - } else { - self.next_(); - } - } - }; - self.blocks[self.index].execute(onComplete); - - calledSynchronously = false; - if (completedSynchronously) { - onComplete(); - } - - } else { - self.running = false; - if (self.onComplete) { - self.onComplete(); - } - } - } -}; - -jasmine.Queue.prototype.results = function() { - var results = new jasmine.NestedResults(); - for (var i = 0; i < this.blocks.length; i++) { - if (this.blocks[i].results) { - results.addResult(this.blocks[i].results()); - } - } - return results; -}; - - -/** - * Runner - * - * @constructor - * @param {jasmine.Env} env - */ -jasmine.Runner = function(env) { - var self = this; - self.env = env; - self.queue = new jasmine.Queue(env); - self.before_ = []; - self.after_ = []; - self.suites_ = []; -}; - -jasmine.Runner.prototype.execute = function() { - var self = this; - if (self.env.reporter.reportRunnerStarting) { - self.env.reporter.reportRunnerStarting(this); - } - self.queue.start(function () { - self.finishCallback(); - }); -}; - -jasmine.Runner.prototype.beforeEach = function(beforeEachFunction) { - beforeEachFunction.typeName = 'beforeEach'; - this.before_.splice(0,0,beforeEachFunction); -}; - -jasmine.Runner.prototype.afterEach = function(afterEachFunction) { - afterEachFunction.typeName = 'afterEach'; - this.after_.splice(0,0,afterEachFunction); -}; - - -jasmine.Runner.prototype.finishCallback = function() { - this.env.reporter.reportRunnerResults(this); -}; - -jasmine.Runner.prototype.addSuite = function(suite) { - this.suites_.push(suite); -}; - -jasmine.Runner.prototype.add = function(block) { - if (block instanceof jasmine.Suite) { - this.addSuite(block); - } - this.queue.add(block); -}; - -jasmine.Runner.prototype.specs = function () { - var suites = this.suites(); - var specs = []; - for (var i = 0; i < suites.length; i++) { - specs = specs.concat(suites[i].specs()); - } - return specs; -}; - -jasmine.Runner.prototype.suites = function() { - return this.suites_; -}; - -jasmine.Runner.prototype.topLevelSuites = function() { - var topLevelSuites = []; - for (var i = 0; i < this.suites_.length; i++) { - if (!this.suites_[i].parentSuite) { - topLevelSuites.push(this.suites_[i]); - } - } - return topLevelSuites; -}; - -jasmine.Runner.prototype.results = function() { - return this.queue.results(); -}; -/** - * Internal representation of a Jasmine specification, or test. - * - * @constructor - * @param {jasmine.Env} env - * @param {jasmine.Suite} suite - * @param {String} description - */ -jasmine.Spec = function(env, suite, description) { - if (!env) { - throw new Error('jasmine.Env() required'); - } - if (!suite) { - throw new Error('jasmine.Suite() required'); - } - var spec = this; - spec.id = env.nextSpecId ? env.nextSpecId() : null; - spec.env = env; - spec.suite = suite; - spec.description = description; - spec.queue = new jasmine.Queue(env); - - spec.afterCallbacks = []; - spec.spies_ = []; - - spec.results_ = new jasmine.NestedResults(); - spec.results_.description = description; - spec.matchersClass = null; -}; - -jasmine.Spec.prototype.getFullName = function() { - return this.suite.getFullName() + ' ' + this.description + '.'; -}; - - -jasmine.Spec.prototype.results = function() { - return this.results_; -}; - -/** - * All parameters are pretty-printed and concatenated together, then written to the spec's output. - * - * Be careful not to leave calls to jasmine.log in production code. - */ -jasmine.Spec.prototype.log = function() { - return this.results_.log(arguments); -}; - -jasmine.Spec.prototype.runs = function (func) { - var block = new jasmine.Block(this.env, func, this); - this.addToQueue(block); - return this; -}; - -jasmine.Spec.prototype.addToQueue = function (block) { - if (this.queue.isRunning()) { - this.queue.insertNext(block); - } else { - this.queue.add(block); - } -}; - -/** - * @param {jasmine.ExpectationResult} result - */ -jasmine.Spec.prototype.addMatcherResult = function(result) { - this.results_.addResult(result); -}; - -jasmine.Spec.prototype.expect = function(actual) { - var positive = new (this.getMatchersClass_())(this.env, actual, this); - positive.not = new (this.getMatchersClass_())(this.env, actual, this, true); - return positive; -}; - -/** - * Waits a fixed time period before moving to the next block. - * - * @deprecated Use waitsFor() instead - * @param {Number} timeout milliseconds to wait - */ -jasmine.Spec.prototype.waits = function(timeout) { - var waitsFunc = new jasmine.WaitsBlock(this.env, timeout, this); - this.addToQueue(waitsFunc); - return this; -}; - -/** - * Waits for the latchFunction to return true before proceeding to the next block. - * - * @param {Function} latchFunction - * @param {String} optional_timeoutMessage - * @param {Number} optional_timeout - */ -jasmine.Spec.prototype.waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) { - var latchFunction_ = null; - var optional_timeoutMessage_ = null; - var optional_timeout_ = null; - - for (var i = 0; i < arguments.length; i++) { - var arg = arguments[i]; - switch (typeof arg) { - case 'function': - latchFunction_ = arg; - break; - case 'string': - optional_timeoutMessage_ = arg; - break; - case 'number': - optional_timeout_ = arg; - break; - } - } - - var waitsForFunc = new jasmine.WaitsForBlock(this.env, optional_timeout_, latchFunction_, optional_timeoutMessage_, this); - this.addToQueue(waitsForFunc); - return this; -}; - -jasmine.Spec.prototype.fail = function (e) { - var expectationResult = new jasmine.ExpectationResult({ - passed: false, - message: e ? jasmine.util.formatException(e) : 'Exception' - }); - this.results_.addResult(expectationResult); -}; - -jasmine.Spec.prototype.getMatchersClass_ = function() { - return this.matchersClass || this.env.matchersClass; -}; - -jasmine.Spec.prototype.addMatchers = function(matchersPrototype) { - var parent = this.getMatchersClass_(); - var newMatchersClass = function() { - parent.apply(this, arguments); - }; - jasmine.util.inherit(newMatchersClass, parent); - jasmine.Matchers.wrapInto_(matchersPrototype, newMatchersClass); - this.matchersClass = newMatchersClass; -}; - -jasmine.Spec.prototype.finishCallback = function() { - this.env.reporter.reportSpecResults(this); -}; - -jasmine.Spec.prototype.finish = function(onComplete) { - this.removeAllSpies(); - this.finishCallback(); - if (onComplete) { - onComplete(); - } -}; - -jasmine.Spec.prototype.after = function(doAfter) { - if (this.queue.isRunning()) { - this.queue.add(new jasmine.Block(this.env, doAfter, this)); - } else { - this.afterCallbacks.unshift(doAfter); - } -}; - -jasmine.Spec.prototype.execute = function(onComplete) { - var spec = this; - if (!spec.env.specFilter(spec)) { - spec.results_.skipped = true; - spec.finish(onComplete); - return; - } - - this.env.reporter.reportSpecStarting(this); - - spec.env.currentSpec = spec; - - spec.addBeforesAndAftersToQueue(); - - spec.queue.start(function () { - spec.finish(onComplete); - }); -}; - -jasmine.Spec.prototype.addBeforesAndAftersToQueue = function() { - var runner = this.env.currentRunner(); - var i; - - for (var suite = this.suite; suite; suite = suite.parentSuite) { - for (i = 0; i < suite.before_.length; i++) { - this.queue.addBefore(new jasmine.Block(this.env, suite.before_[i], this)); - } - } - for (i = 0; i < runner.before_.length; i++) { - this.queue.addBefore(new jasmine.Block(this.env, runner.before_[i], this)); - } - for (i = 0; i < this.afterCallbacks.length; i++) { - this.queue.add(new jasmine.Block(this.env, this.afterCallbacks[i], this)); - } - for (suite = this.suite; suite; suite = suite.parentSuite) { - for (i = 0; i < suite.after_.length; i++) { - this.queue.add(new jasmine.Block(this.env, suite.after_[i], this)); - } - } - for (i = 0; i < runner.after_.length; i++) { - this.queue.add(new jasmine.Block(this.env, runner.after_[i], this)); - } -}; - -jasmine.Spec.prototype.explodes = function() { - throw 'explodes function should not have been called'; -}; - -jasmine.Spec.prototype.spyOn = function(obj, methodName, ignoreMethodDoesntExist) { - if (obj == jasmine.undefined) { - throw "spyOn could not find an object to spy upon for " + methodName + "()"; - } - - if (!ignoreMethodDoesntExist && obj[methodName] === jasmine.undefined) { - throw methodName + '() method does not exist'; - } - - if (!ignoreMethodDoesntExist && obj[methodName] && obj[methodName].isSpy) { - throw new Error(methodName + ' has already been spied upon'); - } - - var spyObj = jasmine.createSpy(methodName); - - this.spies_.push(spyObj); - spyObj.baseObj = obj; - spyObj.methodName = methodName; - spyObj.originalValue = obj[methodName]; - - obj[methodName] = spyObj; - - return spyObj; -}; - -jasmine.Spec.prototype.removeAllSpies = function() { - for (var i = 0; i < this.spies_.length; i++) { - var spy = this.spies_[i]; - spy.baseObj[spy.methodName] = spy.originalValue; - } - this.spies_ = []; -}; - -/** - * Internal representation of a Jasmine suite. - * - * @constructor - * @param {jasmine.Env} env - * @param {String} description - * @param {Function} specDefinitions - * @param {jasmine.Suite} parentSuite - */ -jasmine.Suite = function(env, description, specDefinitions, parentSuite) { - var self = this; - self.id = env.nextSuiteId ? env.nextSuiteId() : null; - self.description = description; - self.queue = new jasmine.Queue(env); - self.parentSuite = parentSuite; - self.env = env; - self.before_ = []; - self.after_ = []; - self.children_ = []; - self.suites_ = []; - self.specs_ = []; -}; - -jasmine.Suite.prototype.getFullName = function() { - var fullName = this.description; - for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) { - fullName = parentSuite.description + ' ' + fullName; - } - return fullName; -}; - -jasmine.Suite.prototype.finish = function(onComplete) { - this.env.reporter.reportSuiteResults(this); - this.finished = true; - if (typeof(onComplete) == 'function') { - onComplete(); - } -}; - -jasmine.Suite.prototype.beforeEach = function(beforeEachFunction) { - beforeEachFunction.typeName = 'beforeEach'; - this.before_.unshift(beforeEachFunction); -}; - -jasmine.Suite.prototype.afterEach = function(afterEachFunction) { - afterEachFunction.typeName = 'afterEach'; - this.after_.unshift(afterEachFunction); -}; - -jasmine.Suite.prototype.results = function() { - return this.queue.results(); -}; - -jasmine.Suite.prototype.add = function(suiteOrSpec) { - this.children_.push(suiteOrSpec); - if (suiteOrSpec instanceof jasmine.Suite) { - this.suites_.push(suiteOrSpec); - this.env.currentRunner().addSuite(suiteOrSpec); - } else { - this.specs_.push(suiteOrSpec); - } - this.queue.add(suiteOrSpec); -}; - -jasmine.Suite.prototype.specs = function() { - return this.specs_; -}; - -jasmine.Suite.prototype.suites = function() { - return this.suites_; -}; - -jasmine.Suite.prototype.children = function() { - return this.children_; -}; - -jasmine.Suite.prototype.execute = function(onComplete) { - var self = this; - this.queue.start(function () { - self.finish(onComplete); - }); -}; -jasmine.WaitsBlock = function(env, timeout, spec) { - this.timeout = timeout; - jasmine.Block.call(this, env, null, spec); -}; - -jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block); - -jasmine.WaitsBlock.prototype.execute = function (onComplete) { - this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...'); - this.env.setTimeout(function () { - onComplete(); - }, this.timeout); -}; -/** - * A block which waits for some condition to become true, with timeout. - * - * @constructor - * @extends jasmine.Block - * @param {jasmine.Env} env The Jasmine environment. - * @param {Number} timeout The maximum time in milliseconds to wait for the condition to become true. - * @param {Function} latchFunction A function which returns true when the desired condition has been met. - * @param {String} message The message to display if the desired condition hasn't been met within the given time period. - * @param {jasmine.Spec} spec The Jasmine spec. - */ -jasmine.WaitsForBlock = function(env, timeout, latchFunction, message, spec) { - this.timeout = timeout || env.defaultTimeoutInterval; - this.latchFunction = latchFunction; - this.message = message; - this.totalTimeSpentWaitingForLatch = 0; - jasmine.Block.call(this, env, null, spec); -}; -jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block); - -jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10; - -jasmine.WaitsForBlock.prototype.execute = function(onComplete) { - this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen')); - var latchFunctionResult; - try { - latchFunctionResult = this.latchFunction.apply(this.spec); - } catch (e) { - this.spec.fail(e); - onComplete(); - return; - } - - if (latchFunctionResult) { - onComplete(); - } else if (this.totalTimeSpentWaitingForLatch >= this.timeout) { - var message = 'timed out after ' + this.timeout + ' msec waiting for ' + (this.message || 'something to happen'); - this.spec.fail({ - name: 'timeout', - message: message - }); - - this.abort = true; - onComplete(); - } else { - this.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT; - var self = this; - this.env.setTimeout(function() { - self.execute(onComplete); - }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT); - } -}; -// Mock setTimeout, clearTimeout -// Contributed by Pivotal Computer Systems, www.pivotalsf.com - -jasmine.FakeTimer = function() { - this.reset(); - - var self = this; - self.setTimeout = function(funcToCall, millis) { - self.timeoutsMade++; - self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false); - return self.timeoutsMade; - }; - - self.setInterval = function(funcToCall, millis) { - self.timeoutsMade++; - self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true); - return self.timeoutsMade; - }; - - self.clearTimeout = function(timeoutKey) { - self.scheduledFunctions[timeoutKey] = jasmine.undefined; - }; - - self.clearInterval = function(timeoutKey) { - self.scheduledFunctions[timeoutKey] = jasmine.undefined; - }; - -}; - -jasmine.FakeTimer.prototype.reset = function() { - this.timeoutsMade = 0; - this.scheduledFunctions = {}; - this.nowMillis = 0; -}; - -jasmine.FakeTimer.prototype.tick = function(millis) { - var oldMillis = this.nowMillis; - var newMillis = oldMillis + millis; - this.runFunctionsWithinRange(oldMillis, newMillis); - this.nowMillis = newMillis; -}; - -jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) { - var scheduledFunc; - var funcsToRun = []; - for (var timeoutKey in this.scheduledFunctions) { - scheduledFunc = this.scheduledFunctions[timeoutKey]; - if (scheduledFunc != jasmine.undefined && - scheduledFunc.runAtMillis >= oldMillis && - scheduledFunc.runAtMillis <= nowMillis) { - funcsToRun.push(scheduledFunc); - this.scheduledFunctions[timeoutKey] = jasmine.undefined; - } - } - - if (funcsToRun.length > 0) { - funcsToRun.sort(function(a, b) { - return a.runAtMillis - b.runAtMillis; - }); - for (var i = 0; i < funcsToRun.length; ++i) { - try { - var funcToRun = funcsToRun[i]; - this.nowMillis = funcToRun.runAtMillis; - funcToRun.funcToCall(); - if (funcToRun.recurring) { - this.scheduleFunction(funcToRun.timeoutKey, - funcToRun.funcToCall, - funcToRun.millis, - true); - } - } catch(e) { - } - } - this.runFunctionsWithinRange(oldMillis, nowMillis); - } -}; - -jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) { - this.scheduledFunctions[timeoutKey] = { - runAtMillis: this.nowMillis + millis, - funcToCall: funcToCall, - recurring: recurring, - timeoutKey: timeoutKey, - millis: millis - }; -}; - -/** - * @namespace - */ -jasmine.Clock = { - defaultFakeTimer: new jasmine.FakeTimer(), - - reset: function() { - jasmine.Clock.assertInstalled(); - jasmine.Clock.defaultFakeTimer.reset(); - }, - - tick: function(millis) { - jasmine.Clock.assertInstalled(); - jasmine.Clock.defaultFakeTimer.tick(millis); - }, - - runFunctionsWithinRange: function(oldMillis, nowMillis) { - jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis); - }, - - scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) { - jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring); - }, - - useMock: function() { - if (!jasmine.Clock.isInstalled()) { - var spec = jasmine.getEnv().currentSpec; - spec.after(jasmine.Clock.uninstallMock); - - jasmine.Clock.installMock(); - } - }, - - installMock: function() { - jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer; - }, - - uninstallMock: function() { - jasmine.Clock.assertInstalled(); - jasmine.Clock.installed = jasmine.Clock.real; - }, - - real: { - setTimeout: jasmine.getGlobal().setTimeout, - clearTimeout: jasmine.getGlobal().clearTimeout, - setInterval: jasmine.getGlobal().setInterval, - clearInterval: jasmine.getGlobal().clearInterval - }, - - assertInstalled: function() { - if (!jasmine.Clock.isInstalled()) { - throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()"); - } - }, - - isInstalled: function() { - return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer; - }, - - installed: null -}; -jasmine.Clock.installed = jasmine.Clock.real; - -//else for IE support -jasmine.getGlobal().setTimeout = function(funcToCall, millis) { - if (jasmine.Clock.installed.setTimeout.apply) { - return jasmine.Clock.installed.setTimeout.apply(this, arguments); - } else { - return jasmine.Clock.installed.setTimeout(funcToCall, millis); - } -}; - -jasmine.getGlobal().setInterval = function(funcToCall, millis) { - if (jasmine.Clock.installed.setInterval.apply) { - return jasmine.Clock.installed.setInterval.apply(this, arguments); - } else { - return jasmine.Clock.installed.setInterval(funcToCall, millis); - } -}; - -jasmine.getGlobal().clearTimeout = function(timeoutKey) { - if (jasmine.Clock.installed.clearTimeout.apply) { - return jasmine.Clock.installed.clearTimeout.apply(this, arguments); - } else { - return jasmine.Clock.installed.clearTimeout(timeoutKey); - } -}; - -jasmine.getGlobal().clearInterval = function(timeoutKey) { - if (jasmine.Clock.installed.clearTimeout.apply) { - return jasmine.Clock.installed.clearInterval.apply(this, arguments); - } else { - return jasmine.Clock.installed.clearInterval(timeoutKey); - } -}; - - -jasmine.version_= { - "major": 1, - "minor": 0, - "build": 1, - "revision": 1286311016 -}; diff --git a/tests/integration/helpers/spec_helpers.js b/tests/integration/helpers/spec_helpers.js deleted file mode 100644 index 960c73b6..00000000 --- a/tests/integration/helpers/spec_helpers.js +++ /dev/null @@ -1,49 +0,0 @@ -/*function basicListViewHTML() { - var html = ''; - - return html; -}*/ -var listViewHelper = {}; - -(function ($, lvh, undefined ) { - - var current_page - , pageShowFired = false; - - - lvh.resetForPage = function(new_page) { - //remove any old event listeners from the current page if defined - if(current_page) - current_page.die('pageshow', lvh.pageshowHandler); - - pageShowFired = false; - current_page = new_page; - current_page.live('pageshow', lvh.pageshowHandler); - } - - lvh.currentPage = function() { - return current_page; - } - - lvh.transitionComplete = function() { - return pageShowFired; - } - - lvh.pageshowHandler = function() { - pageShowFired = true; - } - - lvh.showResultsWhenComplete = function() { - if($('.jasmine_reporter .running').length == 0) { - $('.ui-page-active').css('display', 'none'); - } else { - setTimeout(lvh.showResultsWhenComplete, 500); - } - } - - setTimeout(lvh.showResultsWhenComplete, 500); -})(jQuery, listViewHelper) \ No newline at end of file diff --git a/tests/integration/runner.html b/tests/integration/listviews/index.html similarity index 80% rename from tests/integration/runner.html rename to tests/integration/listviews/index.html index e337ba6a..83b5f632 100644 --- a/tests/integration/runner.html +++ b/tests/integration/listviews/index.html @@ -1,29 +1,25 @@ - - + + - Integration Test Runner - - + + jQuery Mobile Listview Integration Test - - - - - - - - - - + + + + + + - +

jQuery Mobile Listview Integration Test

+

+

+
    +
+
@@ -170,6 +166,5 @@
- diff --git a/tests/integration/listviews/listview_integration.js b/tests/integration/listviews/listview_integration.js new file mode 100644 index 00000000..f0aeb76b --- /dev/null +++ b/tests/integration/listviews/listview_integration.js @@ -0,0 +1,197 @@ +$.testHelper.hideActivePageWhenComplete() + +module('Basic Linked list'); + +asyncTest( "The page should enhanced correctly", function(){ + setTimeout(function() { + ok($('.ui-page-active').length > 0, "ui-page-active added to current page"); + ok($('.ui-page-active [role="option"]').length == 3, "roles added to li elements"); + start(); + }, 100) +}); + +asyncTest( "Slides to the listview page when the li is clicked", function() { + $('.ui-page-active li').first().click(); + setTimeout(function() { + ok($('#basic-link-results').hasClass('ui-page-active')); + start(); + }, 1000) +}); + +asyncTest( "Slides back to main page when back button is clicked", function() { + $('#basic-link-results a:contains("Back")').click(); + setTimeout(function() { + ok($('#basic-linked-test').hasClass('ui-page-active')); + start(); + }, 1000) +}); + +module('Nested List Test') + +asyncTest( "Changes page to nested list test and enhances", function() { + location.href = location.href.split('#')[0] + "#nested-list-test"; + setTimeout(function() { + ok($('#nested-list-test').hasClass('ui-page-active'), "makes nested list test page active"); + ok($('[role="option"]', $('#nested-list-test')).length == 2, 'Adds data role to the two LIs'); + ok($('body > [data-url="nested-list-test&ui-page=More-animals-0"]').length == 1, "Adds first UL to the page"); + ok($('body > [data-url="nested-list-test&ui-page=Groups-of-animals-1"]').length == 1, "Adds second nested UL to the page"); + start(); + }, 1000) +}) + +asyncTest( "change to nested page when the li is clicked", function() { + $('.ui-page-active li:eq(1)').click(); + setTimeout(function() { + var $new_page = $('body > [data-url="nested-list-test&ui-page=More-animals-0"]'); + ok($new_page.hasClass('ui-page-active'), 'Makes the nested page the active page.'); + ok($('.ui-listview', $new_page).find(":contains('Rhumba of rattlesnakes')").length == 1, "The current page should have the proper text in the list."); + ok($('.ui-listview', $new_page).find(":contains('Shoal of Bass')").length == 1, "The current page should have the proper text in the list."); + start(); + }, 1000); +}) + +asyncTest( "should go back to top level when the back button is clicked", function() { + $('body > [data-url="nested-list-test&ui-page=More-animals-0"]').find('a:contains("Back")').click(); + setTimeout(function() { + ok($('#nested-list-test').hasClass('ui-page-active'), 'Transitions back to the parent nested page'); + start(); + }, 1000); +}) + +module('Ordered Lists') + +asyncTest( "changes to the numbered list page and enhances it", function() { + location.href = location.href.split('#')[0] + "#numbered-list-test"; + setTimeout(function() { + var $new_page = $('#numbered-list-test'); + ok($new_page.hasClass('ui-page-active'), "Makes the new page active when the hash is changed."); + ok($('[role="option"]', $new_page).length == 3, "There should be three LI that are enhanced"); + ok($('.ui-link-inherit', $new_page).first().text() == "Number 1", "The text of the first LI should be Number 1"); + start(); + }, 1000); +}); + +asyncTest( "changes to number 1 page when the li is clicked", function() { + $('.ui-page-active li').first().click(); + setTimeout(function() { + ok($('#numbered-list-results').hasClass('ui-page-active'), "The new numbered page was transitioned correctly.") + start(); + }, 1000); +}); + +asyncTest( "takes us back to the numbered list when the back button is clicked", function() { + $('.ui-page-active a:contains("Back")').click(); + setTimeout(function() { + ok($('#numbered-list-test').hasClass('ui-page-active')); + start(); + }, 1000); +}) + +module('Read only list') + +asyncTest( "changes to the read only page when hash is changed", function() { + location.href = location.href.split('#')[0] + "#read-only-list-test"; + setTimeout(function() { + var $new_page = $('#read-only-list-test'); + ok($new_page.hasClass('ui-page-active'), "makes the read only page the active page"); + ok($('[role="option"]', $new_page).length === 4, "There are 4 li that enhanced as role options"); + ok($('li', $new_page).first().text() === "Read", "The first LI has the proper text."); + start(); + }, 1000); +}); + +asyncTest( "Does not go to new page when an item is clicked", function() { + $('li', $('#read-only-list-test').first().click()) + setTimeout(function() { + ok($('.ui-page-active').attr('id') == "read-only-list-test", "Page does not change for read only lists") + start(); + }, 1000); +}); + +module('Split view list') + +asyncTest( "changes the page to the split view list and enhances it correctly.", function() { + location.href = location.href.split('#')[0] + "#split-list-test"; + setTimeout(function() { + var $new_page = $('#split-list-test'); + ok($('[role="option"]', $new_page).length == 3); + ok($('.ui-li-link-alt', $new_page).length == 3); + ok($('.ui-link-inherit', $new_page).length == 3); + start(); + }, 1000); +}); + +asyncTest( "change the page to the split view page 1 when the first link is clicked", function() { + $('.ui-page-active [role="option"]:eq(0)').click(); + setTimeout(function() { + ok($('#split-list-link1').hasClass('ui-page-active')); + start(); + }, 1000); +}); + +asyncTest( "Slide back to the parent list view when the back button is clicked", function() { + $('.ui-page-active a:contains("Back")').click(); + setTimeout(function() { + ok($('#split-list-test').hasClass('ui-page-active')); + start(); + }, 1000); +}); + +asyncTest( "Clicking on the icon (the second link) should take the user to other a href of this LI", function() { + $('.ui-page-active .ui-li-link-alt:eq(0)').click(); + setTimeout(function() { + ok($('#split-list-link2').hasClass('ui-page-active')); + start(); + }, 1000); +}); + +asyncTest( "Slide back to the parent list view when the back button is clicked", function() { + $('.ui-page-active a:contains("Back")').click(); + setTimeout(function() { + ok($('#split-list-test').hasClass('ui-page-active')); + start(); + }, 1000); +}); + +module( "List Dividers" ); + +asyncTest( "Makes the list divider page the active page and enhances it correctly.", function() { + location.href = location.href.split('#')[0] + "#list-divider-test"; + setTimeout(function() { + var $new_page = $('#list-divider-test'); + ok($new_page.find('.ui-li-divider').length == 2); + ok($new_page.hasClass('ui-page-active')); + start(); + }, 1000); +}); + +module( "Search Filter" ); + +asyncTest( "Make the search filter page the actie page and enhance it correctly.", function() { + location.href = location.href.split('#')[0] + "#search-filter-test"; + setTimeout(function() { + var $new_page = $('#search-filter-test'); + ok($new_page.find('input').length == 1); + ok($new_page.hasClass('ui-page-active')); + start(); + }, 1000); +}); + +asyncTest( "Filter downs results when the user enters information", function() { + $('.ui-page-active input').val('at'); + $('.ui-page-active input').trigger('change'); + + setTimeout(function() { + ok($('.ui-page-active li[style="display: none; "]').length == 2); + start(); + }, 1000); +}); + +asyncTest( "Redisplay results when user removes values", function() { + $('.ui-page-active input').val('a') + $('.ui-page-active input').trigger('change'); + setTimeout(function() { + ok($('.ui-page-active li[style="display: none; "]').length == 0) + start(); + }, 1000); +}); diff --git a/tests/integration/specs/ListviewSpec.js b/tests/integration/specs/ListviewSpec.js deleted file mode 100644 index f9d0a554..00000000 --- a/tests/integration/specs/ListviewSpec.js +++ /dev/null @@ -1,280 +0,0 @@ -describe("Listviews", function() { - - describe("Basic Linked list", function() { - it("should setup the listview correctly", function() { - waitsFor(function() { - return ($('.ui-page-active').length > 0) - }) - - runs(function() { - expect($('.ui-page-active .ui-listview').length).toEqual(1); - expect($('.ui-page-active [role="option"]').length).toEqual(3); - }) - }); - - it("should slide the listview page into view when the list view link is clicked", function() { - listViewHelper.resetForPage($('#basic-link-results')) - $('.ui-page-active li').first().click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }) - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }) - }); - - it("should slide back to the main page when the back button is clicked", function() { - listViewHelper.resetForPage($('#basic-linked-test')) - $('#basic-link-results a:contains("Back")').click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }) - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - }); - - describe("Nested List", function() { - it("should change the page to the nested list and make sure the page was enhanced.", function() { - listViewHelper.resetForPage($('#nested-list-test')) - location.href = "http://localhost:8888/tests/integration/runner.html#nested-list-test"; - $.mobile.changePage(listViewHelper.currentPage()); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }) - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(2); - expect($('body > [data-url="nested-list-test&ui-page=More-animals-0"]').length).toEqual(1); - expect($('body > [data-url="nested-list-test&ui-page=Groups-of-animals-1"]').length).toEqual(1); - }); - }); - - it("should change to nested page when it is clicked", function() { - listViewHelper.resetForPage($('body > [data-url="nested-list-test&ui-page=More-animals-0"]')); - $('.ui-page-active li:eq(1)').click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(2); - expect($('.ui-listview', listViewHelper.currentPage()).find(":contains('Rhumba of rattlesnakes')").length).toEqual(1); - expect($('.ui-listview', listViewHelper.currentPage()).find(":contains('Shoal of Bass')").length).toEqual(1); - }); - }); - - it("should go back to top level when the back button is clicked", function() { - listViewHelper.resetForPage($('#nested-list-test')); - $('body > [data-url="nested-list-test&ui-page=More-animals-0"]').find('a:contains("Back")').click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - }); - - describe("Ordered Lists", function() { - it("should change the page to the numbered list and make sure the page was enhanced.", function() { - listViewHelper.resetForPage($('#numbered-list-test')); - location.href = "http://localhost:8888/tests/integration/runner.html#numbered-list-test"; - $.mobile.changePage(listViewHelper.currentPage()); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(3); - expect($('.ui-link-inherit', listViewHelper.currentPage()).first().text()).toEqual("Number 1"); - }); - }); - - it("should take us to number 1 page when click", function() { - listViewHelper.resetForPage($('#numbered-list-results')); - $('.ui-page-active li').first().click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }) - }); - - it("should slide back to the main numbered page when the back button is clicked", function() { - listViewHelper.resetForPage($('#numbered-list-test')); - $('.ui-page-active a:contains("Back")').click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - }); - - describe("read only list", function() { - it("should change the page to the Read only list and make sure the page was enhanced.", function() { - listViewHelper.resetForPage($('#read-only-list-test')); - location.href = "http://localhost:8888/tests/integration/runner.html#read-only-list-test"; - $.mobile.changePage(listViewHelper.currentPage()); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(4); - expect($('li', listViewHelper.currentPage()).first().text()).toEqual("Read"); - }); - }); - - it("should not take us to new page when a list item clicked", function() { - var current_page = $('#read-only-list-test'); - $('li', current_page).first().click(); - - //wait a second to make sure that we give it time to transition if it is going to. It shouldn't - waits(1000); - - runs(function() { - expect($('.ui-page-active').attr('id')).toEqual('read-only-list-test'); - }) - }); - }); - - describe("split view list", function() { - it("should change the page to the split view and list view and enhance the page correctly.", function() { - listViewHelper.resetForPage($('#split-list-test')); - location.href = "http://localhost:8888/tests/integration/runner.html#split-list-test"; - $.mobile.changePage(listViewHelper.currentPage()); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(3); - expect($('.ui-li-link-alt', listViewHelper.currentPage()).length).toEqual(3); - expect($('.ui-link-inherit', listViewHelper.currentPage()).length).toEqual(3); - }); - }); - - it("should change the page to split view page 1 when the first link is clicked", function() { - listViewHelper.resetForPage($('#split-list-link1')); - $('.ui-page-active [role="option"]:eq(0)').click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - - it("should slide the page back to the split list view when the back button is clicked", function() { - listViewHelper.resetForPage($('#split-list-test')); - $('.ui-page-active a:contains("Back")').click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - - /* - * Once the bug in which the changePage call does not update the hash correctly, resulting in the back button - * going back to the wrong page is fixed, then we should implement these tests. - */ - it("should slide to the second link when the right icon is clicked", function() { - //pending - }) - - it("should slide back to the split list view page when teh back button is clicked", function() { - //pending - }); - }); - - describe("List dividers", function() { - it("should make the list divider page the active page and enhance it correctly.", function() { - listViewHelper.resetForPage($('#list-divider-test')); - location.href = "http://localhost:8888/tests/integration/runner.html#list-divider-test"; - $.mobile.changePage(listViewHelper.currentPage()); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect($('.ui-page-active .ui-li-divider').length).toEqual(2); - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - }); - - describe("Search Filter", function() { - it("should make the search filter page the active page and enhance it correctly.", function() { - listViewHelper.resetForPage($('#search-filter-test')); - location.href = "http://localhost:8888/tests/integration/runner.html#search-filter-test"; - $.mobile.changePage(listViewHelper.currentPage()); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect($('.ui-page-active input').length).toEqual(1) - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - - it("should filter down the results when the user enters information", function() { - $('.ui-page-active input').val('at'); - $('.ui-page-active input').trigger('change'); - - waitsFor(function() { - return $('.ui-page-active li[style="display: none; "]').length == 2; - }) - - runs(function() { - expect( $('.ui-page-active li[style="display: none; "]').length).toEqual(2); - }); - }); - - it("if user removes values it should redisplay the results", function() { - $('.ui-page-active input').val('a') - $('.ui-page-active input').trigger('change'); - - waitsFor(function() { - return $('.ui-page-active li[style="display: none; "]').length == 0; - }) - - runs(function() { - expect( $('.ui-page-active li[style="display: none; "]').length).toEqual(0); - }); - }); - }); -}); \ No newline at end of file diff --git a/tests/jquery.testHelper.js b/tests/jquery.testHelper.js index 75a5e465..0b9fdc2a 100644 --- a/tests/jquery.testHelper.js +++ b/tests/jquery.testHelper.js @@ -45,6 +45,15 @@ result = extendFn(result, extraExtension); return result; }; + }, + + hideActivePageWhenComplete: function() { + if( $('#qunit-testresult').length > 0 ) { + $('.ui-page-active').css('display', 'none'); + //location.href = location.href.split('#')[0]; + } else { + setTimeout($.testHelper.hideActivePageWhenComplete, 500); + } } }; })(jQuery); \ No newline at end of file From ee6184c9bb990f2c189a99931510312464ae8e99 Mon Sep 17 00:00:00 2001 From: Jesse Streb Date: Fri, 24 Dec 2010 08:27:24 -0500 Subject: [PATCH 3/6] Fixed issue in which we were changing the location.href to a hardcoded value rather then just the hash. --- tests/integration/helpers/spec_helpers.js | 40 +++ tests/integration/specs/ListviewSpec.js | 285 ++++++++++++++++++++++ 2 files changed, 325 insertions(+) create mode 100644 tests/integration/helpers/spec_helpers.js create mode 100644 tests/integration/specs/ListviewSpec.js diff --git a/tests/integration/helpers/spec_helpers.js b/tests/integration/helpers/spec_helpers.js new file mode 100644 index 00000000..54388c91 --- /dev/null +++ b/tests/integration/helpers/spec_helpers.js @@ -0,0 +1,40 @@ +var listViewHelper = {}; + +(function ($, lvh, undefined ) { + + var current_page + , pageShowFired = false; + + + lvh.resetForPage = function(new_page) { + //remove any old event listeners from the current page if defined + if(current_page) + current_page.die('pageshow', lvh.pageshowHandler); + + pageShowFired = false; + current_page = new_page; + current_page.live('pageshow', lvh.pageshowHandler); + } + + lvh.currentPage = function() { + return current_page; + } + + lvh.transitionComplete = function() { + return pageShowFired; + } + + lvh.pageshowHandler = function() { + pageShowFired = true; + } + + lvh.showResultsWhenComplete = function() { + if($('.jasmine_reporter .running').length == 0) { + $('.ui-page-active').css('display', 'none'); + } else { + setTimeout(lvh.showResultsWhenComplete, 500); + } + } + + setTimeout(lvh.showResultsWhenComplete, 500); +})(jQuery, listViewHelper) \ No newline at end of file diff --git a/tests/integration/specs/ListviewSpec.js b/tests/integration/specs/ListviewSpec.js new file mode 100644 index 00000000..68d978ba --- /dev/null +++ b/tests/integration/specs/ListviewSpec.js @@ -0,0 +1,285 @@ +describe("Listviews", function() { + + describe("Basic Linked list", function() { + it("should setup the listview correctly", function() { + waitsFor(function() { + return ($('.ui-page-active').length > 0) + }) + + runs(function() { + expect($('.ui-page-active .ui-listview').length).toEqual(1); + expect($('.ui-page-active [role="option"]').length).toEqual(3); + }) + }); + + it("should slide the listview page into view when the list view link is clicked", function() { + listViewHelper.resetForPage($('#basic-link-results')) + $('.ui-page-active li').first().click(); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }) + + runs(function() { + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + }) + }); + + it("should slide back to the main page when the back button is clicked", function() { + listViewHelper.resetForPage($('#basic-linked-test')) + $('#basic-link-results a:contains("Back")').click(); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }) + + runs(function() { + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + }); + }); + }); + + describe("Nested List", function() { + it("should change the page to the nested list and make sure the page was enhanced.", function() { + listViewHelper.resetForPage($('#nested-list-test')) + location.href = location.href.split('#')[0] + "#nested-list-test"; + + /* + * Calling change page directly does not update the history so breaks these tests. Checking in passing tests for now + * but once pushState is tackled we should change some of these tests to also use changePage along with just hash changes. + */ + //$.mobile.changePage(listViewHelper.currentPage()); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }) + + runs(function() { + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(2); + expect($('body > [data-url="nested-list-test&ui-page=More-animals-0"]').length).toEqual(1); + expect($('body > [data-url="nested-list-test&ui-page=Groups-of-animals-1"]').length).toEqual(1); + }); + }); + + it("should change to nested page when it is clicked", function() { + listViewHelper.resetForPage($('body > [data-url="nested-list-test&ui-page=More-animals-0"]')); + $('.ui-page-active li:eq(1)').click(); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }); + + runs(function() { + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(2); + expect($('.ui-listview', listViewHelper.currentPage()).find(":contains('Rhumba of rattlesnakes')").length).toEqual(1); + expect($('.ui-listview', listViewHelper.currentPage()).find(":contains('Shoal of Bass')").length).toEqual(1); + }); + }); + + it("should go back to top level when the back button is clicked", function() { + listViewHelper.resetForPage($('#nested-list-test')); + $('body > [data-url="nested-list-test&ui-page=More-animals-0"]').find('a:contains("Back")').click(); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }); + + runs(function() { + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + }); + }); + }); + + describe("Ordered Lists", function() { + it("should change the page to the numbered list and make sure the page was enhanced.", function() { + listViewHelper.resetForPage($('#numbered-list-test')); + location.href = location.href.split('#')[0] + "#numbered-list-test"; + //$.mobile.changePage(listViewHelper.currentPage()); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }); + + runs(function() { + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(3); + expect($('.ui-link-inherit', listViewHelper.currentPage()).first().text()).toEqual("Number 1"); + }); + }); + + it("should take us to number 1 page when click", function() { + listViewHelper.resetForPage($('#numbered-list-results')); + $('.ui-page-active li').first().click(); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }); + + runs(function() { + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + }) + }); + + it("should slide back to the main numbered page when the back button is clicked", function() { + listViewHelper.resetForPage($('#numbered-list-test')); + $('.ui-page-active a:contains("Back")').click(); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }); + + runs(function() { + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + }); + }); + }); + + describe("read only list", function() { + it("should change the page to the Read only list and make sure the page was enhanced.", function() { + listViewHelper.resetForPage($('#read-only-list-test')); + location.href = location.href.split('#')[0] + "#read-only-list-test"; + //$.mobile.changePage(listViewHelper.currentPage()); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }); + + runs(function() { + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(4); + expect($('li', listViewHelper.currentPage()).first().text()).toEqual("Read"); + }); + }); + + it("should not take us to new page when a list item clicked", function() { + var current_page = $('#read-only-list-test'); + $('li', current_page).first().click(); + + //wait a second to make sure that we give it time to transition if it is going to. It shouldn't + waits(1000); + + runs(function() { + expect($('.ui-page-active').attr('id')).toEqual('read-only-list-test'); + }) + }); + }); + + describe("split view list", function() { + it("should change the page to the split view and list view and enhance the page correctly.", function() { + listViewHelper.resetForPage($('#split-list-test')); + location.href = location.href.split('#')[0] + "#split-list-test"; + //$.mobile.changePage(listViewHelper.currentPage()); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }); + + runs(function() { + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(3); + expect($('.ui-li-link-alt', listViewHelper.currentPage()).length).toEqual(3); + expect($('.ui-link-inherit', listViewHelper.currentPage()).length).toEqual(3); + }); + }); + + it("should change the page to split view page 1 when the first link is clicked", function() { + listViewHelper.resetForPage($('#split-list-link1')); + $('.ui-page-active [role="option"]:eq(0)').click(); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }); + + runs(function() { + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + }); + }); + + it("should slide the page back to the split list view when the back button is clicked", function() { + listViewHelper.resetForPage($('#split-list-test')); + $('.ui-page-active a:contains("Back")').click(); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }); + + runs(function() { + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + }); + }); + + /* + * Once the bug in which the changePage call does not update the hash correctly, resulting in the back button + * going back to the wrong page is fixed, then we should implement these tests. + */ + it("should slide to the second link when the right icon is clicked", function() { + //pending + }) + + it("should slide back to the split list view page when teh back button is clicked", function() { + //pending + }); + }); + + describe("List dividers", function() { + it("should make the list divider page the active page and enhance it correctly.", function() { + listViewHelper.resetForPage($('#list-divider-test')); + location.href = location.href.split('#')[0] + "#list-divider-test"; + //$.mobile.changePage(listViewHelper.currentPage()); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }); + + runs(function() { + expect($('.ui-page-active .ui-li-divider').length).toEqual(2); + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + }); + }); + }); + + describe("Search Filter", function() { + it("should make the search filter page the active page and enhance it correctly.", function() { + listViewHelper.resetForPage($('#search-filter-test')); + location.href = location.href.split('#')[0] + "#search-filter-test"; + //$.mobile.changePage(listViewHelper.currentPage()); + + waitsFor(function() { + return listViewHelper.transitionComplete(); + }); + + runs(function() { + expect($('.ui-page-active input').length).toEqual(1) + expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); + }); + }); + + it("should filter down the results when the user enters information", function() { + $('.ui-page-active input').val('at'); + $('.ui-page-active input').trigger('change'); + + waitsFor(function() { + return $('.ui-page-active li[style="display: none; "]').length == 2; + }) + + runs(function() { + expect( $('.ui-page-active li[style="display: none; "]').length).toEqual(2); + }); + }); + + it("if user removes values it should redisplay the results", function() { + $('.ui-page-active input').val('a') + $('.ui-page-active input').trigger('change'); + + waitsFor(function() { + return $('.ui-page-active li[style="display: none; "]').length == 0; + }) + + runs(function() { + expect( $('.ui-page-active li[style="display: none; "]').length).toEqual(0); + }); + }); + }); +}); \ No newline at end of file From 1c5034151e53ecfadaed551ded4bdd249a193cd2 Mon Sep 17 00:00:00 2001 From: Jesse Streb Date: Fri, 31 Dec 2010 13:54:35 -0500 Subject: [PATCH 4/6] removing files that are no longer used --- tests/integration/helpers/spec_helpers.js | 40 --- tests/integration/specs/ListviewSpec.js | 285 ---------------------- 2 files changed, 325 deletions(-) delete mode 100644 tests/integration/helpers/spec_helpers.js delete mode 100644 tests/integration/specs/ListviewSpec.js diff --git a/tests/integration/helpers/spec_helpers.js b/tests/integration/helpers/spec_helpers.js deleted file mode 100644 index 54388c91..00000000 --- a/tests/integration/helpers/spec_helpers.js +++ /dev/null @@ -1,40 +0,0 @@ -var listViewHelper = {}; - -(function ($, lvh, undefined ) { - - var current_page - , pageShowFired = false; - - - lvh.resetForPage = function(new_page) { - //remove any old event listeners from the current page if defined - if(current_page) - current_page.die('pageshow', lvh.pageshowHandler); - - pageShowFired = false; - current_page = new_page; - current_page.live('pageshow', lvh.pageshowHandler); - } - - lvh.currentPage = function() { - return current_page; - } - - lvh.transitionComplete = function() { - return pageShowFired; - } - - lvh.pageshowHandler = function() { - pageShowFired = true; - } - - lvh.showResultsWhenComplete = function() { - if($('.jasmine_reporter .running').length == 0) { - $('.ui-page-active').css('display', 'none'); - } else { - setTimeout(lvh.showResultsWhenComplete, 500); - } - } - - setTimeout(lvh.showResultsWhenComplete, 500); -})(jQuery, listViewHelper) \ No newline at end of file diff --git a/tests/integration/specs/ListviewSpec.js b/tests/integration/specs/ListviewSpec.js deleted file mode 100644 index 68d978ba..00000000 --- a/tests/integration/specs/ListviewSpec.js +++ /dev/null @@ -1,285 +0,0 @@ -describe("Listviews", function() { - - describe("Basic Linked list", function() { - it("should setup the listview correctly", function() { - waitsFor(function() { - return ($('.ui-page-active').length > 0) - }) - - runs(function() { - expect($('.ui-page-active .ui-listview').length).toEqual(1); - expect($('.ui-page-active [role="option"]').length).toEqual(3); - }) - }); - - it("should slide the listview page into view when the list view link is clicked", function() { - listViewHelper.resetForPage($('#basic-link-results')) - $('.ui-page-active li').first().click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }) - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }) - }); - - it("should slide back to the main page when the back button is clicked", function() { - listViewHelper.resetForPage($('#basic-linked-test')) - $('#basic-link-results a:contains("Back")').click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }) - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - }); - - describe("Nested List", function() { - it("should change the page to the nested list and make sure the page was enhanced.", function() { - listViewHelper.resetForPage($('#nested-list-test')) - location.href = location.href.split('#')[0] + "#nested-list-test"; - - /* - * Calling change page directly does not update the history so breaks these tests. Checking in passing tests for now - * but once pushState is tackled we should change some of these tests to also use changePage along with just hash changes. - */ - //$.mobile.changePage(listViewHelper.currentPage()); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }) - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(2); - expect($('body > [data-url="nested-list-test&ui-page=More-animals-0"]').length).toEqual(1); - expect($('body > [data-url="nested-list-test&ui-page=Groups-of-animals-1"]').length).toEqual(1); - }); - }); - - it("should change to nested page when it is clicked", function() { - listViewHelper.resetForPage($('body > [data-url="nested-list-test&ui-page=More-animals-0"]')); - $('.ui-page-active li:eq(1)').click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(2); - expect($('.ui-listview', listViewHelper.currentPage()).find(":contains('Rhumba of rattlesnakes')").length).toEqual(1); - expect($('.ui-listview', listViewHelper.currentPage()).find(":contains('Shoal of Bass')").length).toEqual(1); - }); - }); - - it("should go back to top level when the back button is clicked", function() { - listViewHelper.resetForPage($('#nested-list-test')); - $('body > [data-url="nested-list-test&ui-page=More-animals-0"]').find('a:contains("Back")').click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - }); - - describe("Ordered Lists", function() { - it("should change the page to the numbered list and make sure the page was enhanced.", function() { - listViewHelper.resetForPage($('#numbered-list-test')); - location.href = location.href.split('#')[0] + "#numbered-list-test"; - //$.mobile.changePage(listViewHelper.currentPage()); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(3); - expect($('.ui-link-inherit', listViewHelper.currentPage()).first().text()).toEqual("Number 1"); - }); - }); - - it("should take us to number 1 page when click", function() { - listViewHelper.resetForPage($('#numbered-list-results')); - $('.ui-page-active li').first().click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }) - }); - - it("should slide back to the main numbered page when the back button is clicked", function() { - listViewHelper.resetForPage($('#numbered-list-test')); - $('.ui-page-active a:contains("Back")').click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - }); - - describe("read only list", function() { - it("should change the page to the Read only list and make sure the page was enhanced.", function() { - listViewHelper.resetForPage($('#read-only-list-test')); - location.href = location.href.split('#')[0] + "#read-only-list-test"; - //$.mobile.changePage(listViewHelper.currentPage()); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(4); - expect($('li', listViewHelper.currentPage()).first().text()).toEqual("Read"); - }); - }); - - it("should not take us to new page when a list item clicked", function() { - var current_page = $('#read-only-list-test'); - $('li', current_page).first().click(); - - //wait a second to make sure that we give it time to transition if it is going to. It shouldn't - waits(1000); - - runs(function() { - expect($('.ui-page-active').attr('id')).toEqual('read-only-list-test'); - }) - }); - }); - - describe("split view list", function() { - it("should change the page to the split view and list view and enhance the page correctly.", function() { - listViewHelper.resetForPage($('#split-list-test')); - location.href = location.href.split('#')[0] + "#split-list-test"; - //$.mobile.changePage(listViewHelper.currentPage()); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - expect($('[role="option"]', listViewHelper.currentPage()).length).toEqual(3); - expect($('.ui-li-link-alt', listViewHelper.currentPage()).length).toEqual(3); - expect($('.ui-link-inherit', listViewHelper.currentPage()).length).toEqual(3); - }); - }); - - it("should change the page to split view page 1 when the first link is clicked", function() { - listViewHelper.resetForPage($('#split-list-link1')); - $('.ui-page-active [role="option"]:eq(0)').click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - - it("should slide the page back to the split list view when the back button is clicked", function() { - listViewHelper.resetForPage($('#split-list-test')); - $('.ui-page-active a:contains("Back")').click(); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - - /* - * Once the bug in which the changePage call does not update the hash correctly, resulting in the back button - * going back to the wrong page is fixed, then we should implement these tests. - */ - it("should slide to the second link when the right icon is clicked", function() { - //pending - }) - - it("should slide back to the split list view page when teh back button is clicked", function() { - //pending - }); - }); - - describe("List dividers", function() { - it("should make the list divider page the active page and enhance it correctly.", function() { - listViewHelper.resetForPage($('#list-divider-test')); - location.href = location.href.split('#')[0] + "#list-divider-test"; - //$.mobile.changePage(listViewHelper.currentPage()); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect($('.ui-page-active .ui-li-divider').length).toEqual(2); - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - }); - - describe("Search Filter", function() { - it("should make the search filter page the active page and enhance it correctly.", function() { - listViewHelper.resetForPage($('#search-filter-test')); - location.href = location.href.split('#')[0] + "#search-filter-test"; - //$.mobile.changePage(listViewHelper.currentPage()); - - waitsFor(function() { - return listViewHelper.transitionComplete(); - }); - - runs(function() { - expect($('.ui-page-active input').length).toEqual(1) - expect(listViewHelper.currentPage().hasClass('ui-page-active')).toBeTruthy(); - }); - }); - - it("should filter down the results when the user enters information", function() { - $('.ui-page-active input').val('at'); - $('.ui-page-active input').trigger('change'); - - waitsFor(function() { - return $('.ui-page-active li[style="display: none; "]').length == 2; - }) - - runs(function() { - expect( $('.ui-page-active li[style="display: none; "]').length).toEqual(2); - }); - }); - - it("if user removes values it should redisplay the results", function() { - $('.ui-page-active input').val('a') - $('.ui-page-active input').trigger('change'); - - waitsFor(function() { - return $('.ui-page-active li[style="display: none; "]').length == 0; - }) - - runs(function() { - expect( $('.ui-page-active li[style="display: none; "]').length).toEqual(0); - }); - }); - }); -}); \ No newline at end of file From 2065a1916bafde806dcbb42d0ce0311f6bef8256 Mon Sep 17 00:00:00 2001 From: John Bender Date: Thu, 6 Jan 2011 23:16:45 -0800 Subject: [PATCH 5/6] moved jstrebs integration tests under the unit folder, made it look a bit like the others, and changed the styling to move pages off the screen --- .../listviews/listview_integration.js | 197 ----------------- tests/jquery.testHelper.js | 3 +- .../listviews => unit/listview}/index.html | 21 +- tests/unit/listview/listview_core.js | 203 ++++++++++++++++++ 4 files changed, 221 insertions(+), 203 deletions(-) delete mode 100644 tests/integration/listviews/listview_integration.js rename tests/{integration/listviews => unit/listview}/index.html (91%) create mode 100644 tests/unit/listview/listview_core.js diff --git a/tests/integration/listviews/listview_integration.js b/tests/integration/listviews/listview_integration.js deleted file mode 100644 index f0aeb76b..00000000 --- a/tests/integration/listviews/listview_integration.js +++ /dev/null @@ -1,197 +0,0 @@ -$.testHelper.hideActivePageWhenComplete() - -module('Basic Linked list'); - -asyncTest( "The page should enhanced correctly", function(){ - setTimeout(function() { - ok($('.ui-page-active').length > 0, "ui-page-active added to current page"); - ok($('.ui-page-active [role="option"]').length == 3, "roles added to li elements"); - start(); - }, 100) -}); - -asyncTest( "Slides to the listview page when the li is clicked", function() { - $('.ui-page-active li').first().click(); - setTimeout(function() { - ok($('#basic-link-results').hasClass('ui-page-active')); - start(); - }, 1000) -}); - -asyncTest( "Slides back to main page when back button is clicked", function() { - $('#basic-link-results a:contains("Back")').click(); - setTimeout(function() { - ok($('#basic-linked-test').hasClass('ui-page-active')); - start(); - }, 1000) -}); - -module('Nested List Test') - -asyncTest( "Changes page to nested list test and enhances", function() { - location.href = location.href.split('#')[0] + "#nested-list-test"; - setTimeout(function() { - ok($('#nested-list-test').hasClass('ui-page-active'), "makes nested list test page active"); - ok($('[role="option"]', $('#nested-list-test')).length == 2, 'Adds data role to the two LIs'); - ok($('body > [data-url="nested-list-test&ui-page=More-animals-0"]').length == 1, "Adds first UL to the page"); - ok($('body > [data-url="nested-list-test&ui-page=Groups-of-animals-1"]').length == 1, "Adds second nested UL to the page"); - start(); - }, 1000) -}) - -asyncTest( "change to nested page when the li is clicked", function() { - $('.ui-page-active li:eq(1)').click(); - setTimeout(function() { - var $new_page = $('body > [data-url="nested-list-test&ui-page=More-animals-0"]'); - ok($new_page.hasClass('ui-page-active'), 'Makes the nested page the active page.'); - ok($('.ui-listview', $new_page).find(":contains('Rhumba of rattlesnakes')").length == 1, "The current page should have the proper text in the list."); - ok($('.ui-listview', $new_page).find(":contains('Shoal of Bass')").length == 1, "The current page should have the proper text in the list."); - start(); - }, 1000); -}) - -asyncTest( "should go back to top level when the back button is clicked", function() { - $('body > [data-url="nested-list-test&ui-page=More-animals-0"]').find('a:contains("Back")').click(); - setTimeout(function() { - ok($('#nested-list-test').hasClass('ui-page-active'), 'Transitions back to the parent nested page'); - start(); - }, 1000); -}) - -module('Ordered Lists') - -asyncTest( "changes to the numbered list page and enhances it", function() { - location.href = location.href.split('#')[0] + "#numbered-list-test"; - setTimeout(function() { - var $new_page = $('#numbered-list-test'); - ok($new_page.hasClass('ui-page-active'), "Makes the new page active when the hash is changed."); - ok($('[role="option"]', $new_page).length == 3, "There should be three LI that are enhanced"); - ok($('.ui-link-inherit', $new_page).first().text() == "Number 1", "The text of the first LI should be Number 1"); - start(); - }, 1000); -}); - -asyncTest( "changes to number 1 page when the li is clicked", function() { - $('.ui-page-active li').first().click(); - setTimeout(function() { - ok($('#numbered-list-results').hasClass('ui-page-active'), "The new numbered page was transitioned correctly.") - start(); - }, 1000); -}); - -asyncTest( "takes us back to the numbered list when the back button is clicked", function() { - $('.ui-page-active a:contains("Back")').click(); - setTimeout(function() { - ok($('#numbered-list-test').hasClass('ui-page-active')); - start(); - }, 1000); -}) - -module('Read only list') - -asyncTest( "changes to the read only page when hash is changed", function() { - location.href = location.href.split('#')[0] + "#read-only-list-test"; - setTimeout(function() { - var $new_page = $('#read-only-list-test'); - ok($new_page.hasClass('ui-page-active'), "makes the read only page the active page"); - ok($('[role="option"]', $new_page).length === 4, "There are 4 li that enhanced as role options"); - ok($('li', $new_page).first().text() === "Read", "The first LI has the proper text."); - start(); - }, 1000); -}); - -asyncTest( "Does not go to new page when an item is clicked", function() { - $('li', $('#read-only-list-test').first().click()) - setTimeout(function() { - ok($('.ui-page-active').attr('id') == "read-only-list-test", "Page does not change for read only lists") - start(); - }, 1000); -}); - -module('Split view list') - -asyncTest( "changes the page to the split view list and enhances it correctly.", function() { - location.href = location.href.split('#')[0] + "#split-list-test"; - setTimeout(function() { - var $new_page = $('#split-list-test'); - ok($('[role="option"]', $new_page).length == 3); - ok($('.ui-li-link-alt', $new_page).length == 3); - ok($('.ui-link-inherit', $new_page).length == 3); - start(); - }, 1000); -}); - -asyncTest( "change the page to the split view page 1 when the first link is clicked", function() { - $('.ui-page-active [role="option"]:eq(0)').click(); - setTimeout(function() { - ok($('#split-list-link1').hasClass('ui-page-active')); - start(); - }, 1000); -}); - -asyncTest( "Slide back to the parent list view when the back button is clicked", function() { - $('.ui-page-active a:contains("Back")').click(); - setTimeout(function() { - ok($('#split-list-test').hasClass('ui-page-active')); - start(); - }, 1000); -}); - -asyncTest( "Clicking on the icon (the second link) should take the user to other a href of this LI", function() { - $('.ui-page-active .ui-li-link-alt:eq(0)').click(); - setTimeout(function() { - ok($('#split-list-link2').hasClass('ui-page-active')); - start(); - }, 1000); -}); - -asyncTest( "Slide back to the parent list view when the back button is clicked", function() { - $('.ui-page-active a:contains("Back")').click(); - setTimeout(function() { - ok($('#split-list-test').hasClass('ui-page-active')); - start(); - }, 1000); -}); - -module( "List Dividers" ); - -asyncTest( "Makes the list divider page the active page and enhances it correctly.", function() { - location.href = location.href.split('#')[0] + "#list-divider-test"; - setTimeout(function() { - var $new_page = $('#list-divider-test'); - ok($new_page.find('.ui-li-divider').length == 2); - ok($new_page.hasClass('ui-page-active')); - start(); - }, 1000); -}); - -module( "Search Filter" ); - -asyncTest( "Make the search filter page the actie page and enhance it correctly.", function() { - location.href = location.href.split('#')[0] + "#search-filter-test"; - setTimeout(function() { - var $new_page = $('#search-filter-test'); - ok($new_page.find('input').length == 1); - ok($new_page.hasClass('ui-page-active')); - start(); - }, 1000); -}); - -asyncTest( "Filter downs results when the user enters information", function() { - $('.ui-page-active input').val('at'); - $('.ui-page-active input').trigger('change'); - - setTimeout(function() { - ok($('.ui-page-active li[style="display: none; "]').length == 2); - start(); - }, 1000); -}); - -asyncTest( "Redisplay results when user removes values", function() { - $('.ui-page-active input').val('a') - $('.ui-page-active input').trigger('change'); - setTimeout(function() { - ok($('.ui-page-active li[style="display: none; "]').length == 0) - start(); - }, 1000); -}); diff --git a/tests/jquery.testHelper.js b/tests/jquery.testHelper.js index 0b9fdc2a..35a28269 100644 --- a/tests/jquery.testHelper.js +++ b/tests/jquery.testHelper.js @@ -46,11 +46,10 @@ return result; }; }, - + hideActivePageWhenComplete: function() { if( $('#qunit-testresult').length > 0 ) { $('.ui-page-active').css('display', 'none'); - //location.href = location.href.split('#')[0]; } else { setTimeout($.testHelper.hideActivePageWhenComplete, 500); } diff --git a/tests/integration/listviews/index.html b/tests/unit/listview/index.html similarity index 91% rename from tests/integration/listviews/index.html rename to tests/unit/listview/index.html index 83b5f632..7c0cacce 100644 --- a/tests/integration/listviews/index.html +++ b/tests/unit/listview/index.html @@ -10,7 +10,7 @@ - + @@ -20,6 +20,19 @@
+ +
diff --git a/tests/unit/listview/listview_core.js b/tests/unit/listview/listview_core.js new file mode 100644 index 00000000..460113a2 --- /dev/null +++ b/tests/unit/listview/listview_core.js @@ -0,0 +1,203 @@ +/* + * mobile listview unit tests + */ + + +// TODO splite out into seperate test files +(function(){ + module('Basic Linked list'); + + asyncTest( "The page should enhanced correctly", function(){ + setTimeout(function() { + ok($('.ui-page-active').length > 0, "ui-page-active added to current page"); + ok($('.ui-page-active [role="option"]').length == 3, "roles added to li elements"); + start(); + }, 100); + }); + + asyncTest( "Slides to the listview page when the li is clicked", function() { + $('.ui-page-active li').first().click(); + setTimeout(function() { + ok($('#basic-link-results').hasClass('ui-page-active')); + start(); + }, 1000); + }); + + asyncTest( "Slides back to main page when back button is clicked", function() { + $('#basic-link-results a:contains("Back")').click(); + setTimeout(function() { + ok($('#basic-linked-test').hasClass('ui-page-active')); + start(); + }, 1000); + }); + + module('Nested List Test'); + + asyncTest( "Changes page to nested list test and enhances", function() { + location.href = location.href.split('#')[0] + "#nested-list-test"; + setTimeout(function() { + ok($('#nested-list-test').hasClass('ui-page-active'), "makes nested list test page active"); + ok($('[role="option"]', $('#nested-list-test')).length == 2, 'Adds data role to the two LIs'); + ok($('body > [data-url="nested-list-test&ui-page=More-animals-0"]').length == 1, "Adds first UL to the page"); + ok($('body > [data-url="nested-list-test&ui-page=Groups-of-animals-1"]').length == 1, "Adds second nested UL to the page"); + start(); + }, 1000) + }) + + asyncTest( "change to nested page when the li is clicked", function() { + $('.ui-page-active li:eq(1)').click(); + setTimeout(function() { + var $new_page = $('body > [data-url="nested-list-test&ui-page=More-animals-0"]'); + ok($new_page.hasClass('ui-page-active'), 'Makes the nested page the active page.'); + ok($('.ui-listview', $new_page).find(":contains('Rhumba of rattlesnakes')").length == 1, "The current page should have the proper text in the list."); + ok($('.ui-listview', $new_page).find(":contains('Shoal of Bass')").length == 1, "The current page should have the proper text in the list."); + start(); + }, 1000); + }) + + asyncTest( "should go back to top level when the back button is clicked", function() { + $('body > [data-url="nested-list-test&ui-page=More-animals-0"]').find('a:contains("Back")').click(); + setTimeout(function() { + ok($('#nested-list-test').hasClass('ui-page-active'), 'Transitions back to the parent nested page'); + start(); + }, 1000); + }) + + module('Ordered Lists') + + asyncTest( "changes to the numbered list page and enhances it", function() { + location.href = location.href.split('#')[0] + "#numbered-list-test"; + setTimeout(function() { + var $new_page = $('#numbered-list-test'); + ok($new_page.hasClass('ui-page-active'), "Makes the new page active when the hash is changed."); + ok($('[role="option"]', $new_page).length == 3, "There should be three LI that are enhanced"); + ok($('.ui-link-inherit', $new_page).first().text() == "Number 1", "The text of the first LI should be Number 1"); + start(); + }, 1000); + }); + + asyncTest( "changes to number 1 page when the li is clicked", function() { + $('.ui-page-active li').first().click(); + setTimeout(function() { + ok($('#numbered-list-results').hasClass('ui-page-active'), "The new numbered page was transitioned correctly.") + start(); + }, 1000); + }); + + asyncTest( "takes us back to the numbered list when the back button is clicked", function() { + $('.ui-page-active a:contains("Back")').click(); + setTimeout(function() { + ok($('#numbered-list-test').hasClass('ui-page-active')); + start(); + }, 1000); + }) + + module('Read only list') + + asyncTest( "changes to the read only page when hash is changed", function() { + location.href = location.href.split('#')[0] + "#read-only-list-test"; + setTimeout(function() { + var $new_page = $('#read-only-list-test'); + ok($new_page.hasClass('ui-page-active'), "makes the read only page the active page"); + ok($('[role="option"]', $new_page).length === 4, "There are 4 li that enhanced as role options"); + ok($('li', $new_page).first().text() === "Read", "The first LI has the proper text."); + start(); + }, 1000); + }); + + asyncTest( "Does not go to new page when an item is clicked", function() { + $('li', $('#read-only-list-test').first().click()) + setTimeout(function() { + ok($('.ui-page-active').attr('id') == "read-only-list-test", "Page does not change for read only lists") + start(); + }, 1000); + }); + + module('Split view list') + + asyncTest( "changes the page to the split view list and enhances it correctly.", function() { + location.href = location.href.split('#')[0] + "#split-list-test"; + setTimeout(function() { + var $new_page = $('#split-list-test'); + ok($('[role="option"]', $new_page).length == 3); + ok($('.ui-li-link-alt', $new_page).length == 3); + ok($('.ui-link-inherit', $new_page).length == 3); + start(); + }, 1000); + }); + + asyncTest( "change the page to the split view page 1 when the first link is clicked", function() { + $('.ui-page-active [role="option"]:eq(0)').click(); + setTimeout(function() { + ok($('#split-list-link1').hasClass('ui-page-active')); + start(); + }, 1000); + }); + + asyncTest( "Slide back to the parent list view when the back button is clicked", function() { + $('.ui-page-active a:contains("Back")').click(); + setTimeout(function() { + ok($('#split-list-test').hasClass('ui-page-active')); + start(); + }, 1000); + }); + + asyncTest( "Clicking on the icon (the second link) should take the user to other a href of this LI", function() { + $('.ui-page-active .ui-li-link-alt:eq(0)').click(); + setTimeout(function() { + ok($('#split-list-link2').hasClass('ui-page-active')); + start(); + }, 1000); + }); + + asyncTest( "Slide back to the parent list view when the back button is clicked", function() { + $('.ui-page-active a:contains("Back")').click(); + setTimeout(function() { + ok($('#split-list-test').hasClass('ui-page-active')); + start(); + }, 1000); + }); + + module( "List Dividers" ); + + asyncTest( "Makes the list divider page the active page and enhances it correctly.", function() { + location.href = location.href.split('#')[0] + "#list-divider-test"; + setTimeout(function() { + var $new_page = $('#list-divider-test'); + ok($new_page.find('.ui-li-divider').length == 2); + ok($new_page.hasClass('ui-page-active')); + start(); + }, 1000); + }); + + module( "Search Filter" ); + + asyncTest( "Make the search filter page the actie page and enhance it correctly.", function() { + location.href = location.href.split('#')[0] + "#search-filter-test"; + setTimeout(function() { + var $new_page = $('#search-filter-test'); + ok($new_page.find('input').length == 1); + ok($new_page.hasClass('ui-page-active')); + start(); + }, 1000); + }); + + asyncTest( "Filter downs results when the user enters information", function() { + $('.ui-page-active input').val('at'); + $('.ui-page-active input').trigger('change'); + + setTimeout(function() { + ok($('.ui-page-active li[style="display: none; "]').length == 2); + start(); + }, 1000); + }); + + asyncTest( "Redisplay results when user removes values", function() { + $('.ui-page-active input').val('a'); + $('.ui-page-active input').trigger('change'); + setTimeout(function() { + ok($('.ui-page-active li[style="display: none; "]').length == 0); + start(); + }, 1000); + }); +})(); \ No newline at end of file From c910f4b01fcd88acf5ea3794233f2f6d6a8c18ce Mon Sep 17 00:00:00 2001 From: Kin Blas Date: Fri, 7 Jan 2011 01:07:22 -0800 Subject: [PATCH 6/6] Fix for issues: 470 - Multiple Footers when using data-position=fixed and data-id=[someid] 773 - The fixHeaderFooter pagebeforeshow live function is not triggered for the initial page shown - Removed the findStickyFooter() function. - Reworked the logic in the pagebeforeshow live function. We now add a ui-sticky-footer class to the sticky footer element. This will guarantee that we find the sticky footer if it already exists. We may at some point want to consider the use of ids on the sticky footers so that we don't have to crawl the entire document. - Moved the live pagebeforeshow and pageshow calls outside of the DOMReady function so that they get registered as soon as the plugin is loaded. This guarantees that they will be triggered when the core plugin's DOMReady function fires. - This fix makes issue/pull-request 765 obsolete. --- js/jquery.mobile.fixHeaderFooter.js | 60 +++++++++++++++-------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/js/jquery.mobile.fixHeaderFooter.js b/js/jquery.mobile.fixHeaderFooter.js index 9c69ee3e..a4cd034a 100644 --- a/js/jquery.mobile.fixHeaderFooter.js +++ b/js/jquery.mobile.fixHeaderFooter.js @@ -62,36 +62,38 @@ $.fixedToolbars = (function(){ } stateBefore = null; }); - - //function to return another footer already in the dom with the same data-id - function findStickyFooter(el){ - var thisFooter = el.find('[data-role="footer"]'); - return $( '.ui-footer[data-id="'+ thisFooter.data('id') +'"]:not(.ui-footer-duplicate)' ).not(thisFooter); - } - - //before page is shown, check for duplicate footer - $('.ui-page').live('pagebeforeshow', function(event, ui){ - stickyFooter = findStickyFooter( $(event.target) ); - if( stickyFooter.length ){ - //if the existing footer is the first of its kind, create a placeholder before stealing it - if( stickyFooter.parents('.ui-page:eq(0)').find('.ui-footer[data-id="'+ stickyFooter.data('id') +'"]').length == 1 ){ - stickyFooter.before( stickyFooter.clone().addClass('ui-footer-duplicate') ); - } - $(event.target).find('[data-role="footer"]').addClass('ui-footer-duplicate'); - stickyFooter.appendTo($.pageContainer).css('top',0); - setTop(stickyFooter); - } - }); - - //after page is shown, append footer to new page - $('.ui-page').live('pageshow', function(event, ui){ - if( stickyFooter && stickyFooter.length ){ - stickyFooter.appendTo(event.target).css('top',0); - } - $.fixedToolbars.show(true, this); - }); - }); + + //before page is shown, check for duplicate footer + $('.ui-page').live('pagebeforeshow', function(event, ui){ + var page = $(event.target); + var footer = page.find('[data-role="footer"]:not(.ui-sticky-footer)'); + var id = footer.data('id'); + if (id) + { + stickyFooter = $('.ui-footer[data-id="' + id + '"].ui-sticky-footer'); + if (stickyFooter.length == 0) { + // No sticky footer exists for this data-id. We'll use this + // footer as the sticky footer for the group and then create + // a placeholder footer for the page. + stickyFooter = footer; + footer = stickyFooter.clone(); // footer placeholder + stickyFooter.addClass('ui-sticky-footer').before(footer); + } + footer.addClass('ui-footer-duplicate'); + stickyFooter.appendTo($.pageContainer).css('top',0); + setTop(stickyFooter); + } + }); + + //after page is shown, append footer to new page + $('.ui-page').live('pageshow', function(event, ui){ + if( stickyFooter && stickyFooter.length ){ + stickyFooter.appendTo(event.target).css('top',0); + } + $.fixedToolbars.show(true, this); + }); + // element.getBoundingClientRect() is broken in iOS 3.2.1 on the iPad. The // coordinates inside of the rect it returns don't have the page scroll position