From 72b5ede0da6134ae36e2b0dc6512fdadc220ac67 Mon Sep 17 00:00:00 2001
From: Christian Williams <antixian666@gmail.com>
Date: Thu, 24 Dec 2009 10:53:57 -0500
Subject: [PATCH] Move custom matcher specs to their own suite.

---
 spec/runner.html                  |  1 +
 spec/suites/CustomMatchersSpec.js | 41 +++++++++++++++++++++++++++++++
 spec/suites/SpecRunningSpec.js    | 31 -----------------------
 3 files changed, 42 insertions(+), 31 deletions(-)
 create mode 100644 spec/suites/CustomMatchersSpec.js

diff --git a/spec/runner.html b/spec/runner.html
index 30b4f3fe..bd8ea4be 100644
--- a/spec/runner.html
+++ b/spec/runner.html
@@ -35,6 +35,7 @@
   <script type="text/javascript">
     (function () {
       var suites = [
+        'suites/CustomMatchersSpec.js',
         'suites/EnvSpec.js',
         'suites/ExceptionsSpec.js',
         'suites/JsApiReporterSpec.js',
diff --git a/spec/suites/CustomMatchersSpec.js b/spec/suites/CustomMatchersSpec.js
new file mode 100644
index 00000000..51af930d
--- /dev/null
+++ b/spec/suites/CustomMatchersSpec.js
@@ -0,0 +1,41 @@
+describe("Custom Matchers", function() {
+  var env;
+  var fakeTimer;
+
+  beforeEach(function() {
+    env = new jasmine.Env();
+    env.updateInterval = 0;
+  });
+
+  it("should be easy to add more matchers local to a spec, suite, etc.", function() {
+    var spec1, spec2, spec1Matcher, spec2Matcher;
+
+    var suite = env.describe('some suite', function() {
+      env.beforeEach(function() {
+        this.addMatchers({ matcherForSuite: function(expected) {
+          return "matcherForSuite: actual: " + this.actual + "; expected: " + expected;
+        } });
+      });
+
+      spec1 = env.it('spec with an expectation').runs(function () {
+        this.addMatchers({ matcherForSpec: function(expected) {
+          return "matcherForSpec: actual: " + this.actual + "; expected: " + expected;
+        } });
+        spec1Matcher = this.expect("xxx");
+      });
+
+      spec2 = env.it('spec with failing expectation').runs(function () {
+        spec2Matcher = this.expect("yyy");
+      });
+    });
+
+    suite.execute();
+
+    expect(spec1Matcher.matcherForSuite("expected")).toEqual("matcherForSuite: actual: xxx; expected: expected");
+    expect(spec1Matcher.matcherForSpec("expected")).toEqual("matcherForSpec: actual: xxx; expected: expected");
+
+    expect(spec2Matcher.matcherForSuite("expected")).toEqual("matcherForSuite: actual: yyy; expected: expected");
+    expect(spec2Matcher.matcherForSpec).toBe(jasmine.undefined);
+  });
+  
+});
\ No newline at end of file
diff --git a/spec/suites/SpecRunningSpec.js b/spec/suites/SpecRunningSpec.js
index ec49a77c..2dea698e 100644
--- a/spec/suites/SpecRunningSpec.js
+++ b/spec/suites/SpecRunningSpec.js
@@ -1083,35 +1083,4 @@ describe("jasmine spec running", function () {
     expect(exceptionMessage).toEqual('explodes function should not have been called');
   });
 
-  it("should be easy to add more matchers local to a spec, suite, etc.", function() {
-    var spec1, spec2, spec1Matcher, spec2Matcher;
-
-    var suite = env.describe('some suite', function() {
-      env.beforeEach(function() {
-        this.addMatchers({ matcherForSuite: function(expected) {
-          return "matcherForSuite: actual: " + this.actual + "; expected: " + expected;
-        } });
-      });
-
-      spec1 = env.it('spec with an expectation').runs(function () {
-        this.addMatchers({ matcherForSpec: function(expected) {
-          return "matcherForSpec: actual: " + this.actual + "; expected: " + expected;
-        } });
-        spec1Matcher = this.expect("xxx");
-      });
-
-      spec2 = env.it('spec with failing expectation').runs(function () {
-        spec2Matcher = this.expect("yyy");
-      });
-    });
-
-    suite.execute();
-
-    expect(spec1Matcher.matcherForSuite("expected")).toEqual("matcherForSuite: actual: xxx; expected: expected");
-    expect(spec1Matcher.matcherForSpec("expected")).toEqual("matcherForSpec: actual: xxx; expected: expected");
-
-    expect(spec2Matcher.matcherForSuite("expected")).toEqual("matcherForSuite: actual: yyy; expected: expected");
-    expect(spec2Matcher.matcherForSpec).toBe(jasmine.undefined);
-  });
-
 });