aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--angularFiles.js2
-rw-r--r--test/matchers.js89
-rw-r--r--test/testabilityPatch.js86
3 files changed, 92 insertions, 85 deletions
diff --git a/angularFiles.js b/angularFiles.js
index 3b4d91ee..2cf26719 100644
--- a/angularFiles.js
+++ b/angularFiles.js
@@ -64,6 +64,7 @@ angularFiles = {
'@angularSrc',
'example/personalLog/*.js',
'test/testabilityPatch.js',
+ 'test/matchers.js',
'src/scenario/Scenario.js',
'src/scenario/output/*.js',
'src/jstd-scenario-adapter/*.js',
@@ -117,6 +118,7 @@ angularFiles = {
'@angularSrc',
'example/personalLog/*.js',
'test/testabilityPatch.js',
+ 'test/matchers.js',
'src/scenario/Scenario.js',
'src/scenario/output/*.js',
'src/jstd-scenario-adapter/*.js',
diff --git a/test/matchers.js b/test/matchers.js
new file mode 100644
index 00000000..fe5792a9
--- /dev/null
+++ b/test/matchers.js
@@ -0,0 +1,89 @@
+beforeEach(function() {
+
+ function cssMatcher(presentClasses, absentClasses) {
+ return function() {
+ var element = angular.element(this.actual);
+ var present = true;
+ var absent = false;
+
+ angular.forEach(presentClasses.split(' '), function(className){
+ present = present && element.hasClass(className);
+ });
+
+ angular.forEach(absentClasses.split(' '), function(className){
+ absent = absent || element.hasClass(className);
+ });
+
+ this.message = function() {
+ return "Expected to have " + presentClasses +
+ (absentClasses ? (" and not have " + absentClasses + "" ) : "") +
+ " but had " + element[0].className + ".";
+ };
+ return present && !absent;
+ };
+ }
+
+ this.addMatchers({
+ toBeInvalid: cssMatcher('ng-invalid', 'ng-valid'),
+ toBeValid: cssMatcher('ng-valid', 'ng-invalid'),
+ toBeDirty: cssMatcher('ng-dirty', 'ng-pristine'),
+ toBePristine: cssMatcher('ng-pristine', 'ng-dirty'),
+
+ toEqualData: function(expected) {
+ return angular.equals(this.actual, expected);
+ },
+
+ toEqualError: function(message) {
+ this.message = function() {
+ var expected;
+ if (this.actual.message && this.actual.name == 'Error') {
+ expected = toJson(this.actual.message);
+ } else {
+ expected = toJson(this.actual);
+ }
+ return "Expected " + expected + " to be an Error with message " + toJson(message);
+ };
+ return this.actual.name == 'Error' && this.actual.message == message;
+ },
+
+ toMatchError: function(messageRegexp) {
+ this.message = function() {
+ var expected;
+ if (this.actual.message && this.actual.name == 'Error') {
+ expected = angular.toJson(this.actual.message);
+ } else {
+ expected = angular.toJson(this.actual);
+ }
+ return "Expected " + expected + " to match an Error with message " + angular.toJson(messageRegexp);
+ };
+ return this.actual.name == 'Error' && messageRegexp.test(this.actual.message);
+ },
+
+ toHaveBeenCalledOnce: function() {
+ if (arguments.length > 0) {
+ throw new Error('toHaveBeenCalledOnce 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() {
+ var msg = 'Expected spy ' + this.actual.identity + ' to have been called once, but was ',
+ count = this.actual.callCount;
+ return [
+ count === 0 ? msg + 'never called.' :
+ msg + 'called ' + count + ' times.',
+ msg.replace('to have', 'not to have') + 'called once.'
+ ];
+ };
+
+ return this.actual.callCount == 1;
+ },
+
+
+ toBeOneOf: function() {
+ return angular.Array.indexOf(arguments, this.actual) !== -1;
+ }
+ });
+});
diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js
index b3316c0c..a8b1c06b 100644
--- a/test/testabilityPatch.js
+++ b/test/testabilityPatch.js
@@ -64,39 +64,7 @@ beforeEach(function() {
bindJQuery();
jqLite(document.body).html('');
- function cssMatcher(presentClasses, absentClasses) {
- return function() {
- var element = jqLite(this.actual);
- var present = true;
- var absent = false;
-
- forEach(presentClasses.split(' '), function(className){
- present = present && element.hasClass(className);
- });
-
- forEach(absentClasses.split(' '), function(className){
- absent = absent || element.hasClass(className);
- });
-
- this.message = function() {
- return "Expected to have " + presentClasses +
- (absentClasses ? (" and not have " + absentClasses + "" ) : "") +
- " but had " + element[0].className + ".";
- };
- return present && !absent;
- };
- }
-
this.addMatchers({
- toBeInvalid: cssMatcher('ng-invalid', 'ng-valid'),
- toBeValid: cssMatcher('ng-valid', 'ng-invalid'),
- toBeDirty: cssMatcher('ng-dirty', 'ng-pristine'),
- toBePristine: cssMatcher('ng-pristine', 'ng-dirty'),
-
- toEqualData: function(expected) {
- return equals(this.actual, expected);
- },
-
toHaveClass: function(clazz) {
this.message = function() {
return "Expected '" + sortedHtml(this.actual) + "' to have class '" + clazz + "'.";
@@ -104,59 +72,6 @@ beforeEach(function() {
return this.actual.hasClass ?
this.actual.hasClass(clazz) :
jqLite(this.actual).hasClass(clazz);
- },
-
- toEqualError: function(message) {
- this.message = function() {
- var expected;
- if (this.actual.message && this.actual.name == 'Error') {
- expected = toJson(this.actual.message);
- } else {
- expected = toJson(this.actual);
- }
- return "Expected " + expected + " to be an Error with message " + toJson(message);
- };
- return this.actual.name == 'Error' && this.actual.message == message;
- },
-
- toMatchError: function(messageRegexp) {
- this.message = function() {
- var expected;
- if (this.actual.message && this.actual.name == 'Error') {
- expected = toJson(this.actual.message);
- } else {
- expected = toJson(this.actual);
- }
- return "Expected " + expected + " to match an Error with message " + toJson(messageRegexp);
- };
- return this.actual.name == 'Error' && messageRegexp.test(this.actual.message);
- },
-
- toHaveBeenCalledOnce: function() {
- if (arguments.length > 0) {
- throw new Error('toHaveBeenCalledOnce 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() {
- var msg = 'Expected spy ' + this.actual.identity + ' to have been called once, but was ',
- count = this.actual.callCount;
- return [
- count == 0 ? msg + 'never called.'
- : msg + 'called ' + count + ' times.',
- msg.replace('to have', 'not to have') + 'called once.'
- ];
- };
-
- return this.actual.callCount == 1;
- },
-
-
- toBeOneOf: function() {
- return angularArray.indexOf(arguments, this.actual) !== -1;
}
});
@@ -344,6 +259,7 @@ function sortedHtml(element, showNgClass) {
}
+// TODO(vojta): migrate these helpers into jasmine matchers
/**
* This method is a cheap way of testing if css for a given node is not set to 'none'. It doesn't
* actually test if an element is displayed by the browser. Be aware!!!
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 21:18:03 +0000