Skip to content
This repository has been archived by the owner on Jul 26, 2023. It is now read-only.

Improves error messages for toHaveText and toContainElement matchers #281

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions lib/jasmine-jquery.js
Original file line number Diff line number Diff line change
Expand Up @@ -512,11 +512,18 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
var actualText = $(actual).text()
var trimmedText = $.trim(actualText)

var result;
if (text && $.isFunction(text.test)) {
return { pass: text.test(actualText) || text.test(trimmedText) }
result = { pass: text.test(actualText) || text.test(trimmedText) }
} else {
return { pass: (actualText == text || trimmedText == text) }
result = { pass: (actualText == text || trimmedText == text) }
}

result.message = result.pass ?
"Expected element '" + $(actual).html() + "' not to have text " + text :
"Expected element '" + $(actual).html() + "' to have text " + text;

return result;
}
}
},
Expand Down Expand Up @@ -554,7 +561,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
toContainElement: function () {
return {
compare: function (actual, selector) {
return { pass: $(actual).find(selector).length }
var result = { pass: $(actual).find(selector).length };

result.message = result.pass ?
"Expected element '" + $(actual).html() + "' not to have element " + selector :
"Expected element '" + $(actual).html() + "' to have element " + selector;

return result;
}
}
},
Expand Down