Merge pull request #4159 from rjackson/add_ember_setupForTesting

Add Ember.setupForTesting.
emberjs · Jan 21, 2014 · 95e8503 · 95e8503
2 parents 888bf56 + 1534927
commit 95e8503
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/packages/ember-testing/lib/ext.js b/packages/ember-testing/lib/ext.js
@@ -0,0 +1,18 @@
+/**
+  Sets Ember up for testing. This is useful to perform
+  basic setup steps in order to unit test.
+  
+  Use `App.setupForTesting` to perform integration tests (full
+  application testing).
+
+  @method setupForTesting
+  @namespace Ember
+*/
+Ember.setupForTesting = function() {
+  Ember.testing = true;
+
+  // if adapter is not manually set default to QUnit
+  if (!Ember.Test.adapter) {
+    Ember.Test.adapter = Ember.Test.QUnitAdapter.create();
+  }
+};
diff --git a/packages/ember-testing/lib/main.js b/packages/ember-testing/lib/main.js
@@ -1,5 +1,6 @@
 require('ember-application');
 require('ember-routing');
+require('ember-testing/ext');
 require('ember-testing/test');
 require('ember-testing/initializers');
 require('ember-testing/support');

diff --git a/packages/ember-testing/lib/test.js b/packages/ember-testing/lib/test.js
@@ -351,19 +351,14 @@ Ember.Application.reopen({
     @method setupForTesting
   */
   setupForTesting: function() {
-    Ember.testing = true;
+    Ember.setupForTesting();
 
     this.testing = true;
 
     this.Router.reopen({
       location: 'none'
     });
 
-    // if adapter is not manually set default to QUnit
-    if (!Ember.Test.adapter) {
-       Ember.Test.adapter = Ember.Test.QUnitAdapter.create();
-    }
-
     if (Ember.FEATURES.isEnabled('ember-testing-simple-setup')){
       this.testingSetup = true;
     }