fix tests

igorrKurr · igorrKurr · commit cfbaed10c367 · 2015-12-20T15:02:42.000+02:00
diff --git a/tests/acceptance/auth-test.js b/tests/acceptance/auth-test.js
@@ -1,6 +1,7 @@
 import Ember from 'ember';
 import {module, test} from 'qunit';
 import startApp from '../helpers/start-app';
+import { invalidateSession, authenticateSession } from '../helpers/ember-simple-auth';
 
 var application;
 
@@ -16,7 +17,7 @@ module('Acceptance: Auth', {
 test('redirects to /login when I try to see content as not authenticated user', function(assert) {
   assert.expect(2);
 
-  invalidateSession();
+  invalidateSession(application);
   visit('/');
 
   andThen(function() {
@@ -33,10 +34,10 @@ test('redirects to /login when I try to see content as not authenticated user',
 test('shows content when I`m authenticated', function(assert) {
   assert.expect(1);
 
-  authenticateSession();
+  authenticateSession(application, { id: 1 });
   visit('/');
 
   andThen(function() {
     assert.equal(currentURL(), '/');
   });
-});
+});
diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -3,21 +3,34 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>Dummy</title>
+    <title>Dummy Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     {{content-for 'head'}}
+    {{content-for 'test-head'}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/dummy.css">
+    <link rel="stylesheet" href="assets/test-support.css">
   </head>
   <body>
     {{content-for 'body'}}
-
+    {{content-for 'test-body'}}
     <script src="assets/vendor.js"></script>
+    <script src="assets/test-support.js"></script>
     <script src="assets/dummy.js"></script>
-    <script src="http://api-maps.yandex.ru/2.0/?load=package.standard&lang=ru-Ru"></script>
-    <script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&key=AIzaSyCqyf1CwoH9VU6XNYBmIXZSRsMQ0BJUOrw&libraries=places"></script>
+    <script src="testem.js"></script>
+    <script src="assets/test-loader.js"></script>
+    <script type="text/javascript" charset="utf-8">
+      Function.prototype.bind = Function.prototype.bind || function (thisp) {
+          var fn = this;
+          return function () {
+              return fn.apply(thisp, arguments);
+          };
+      };
+    </script>
+    {{content-for 'body-footer'}}
+    {{content-for 'test-body-footer'}}
   </body>
 </html>
diff --git a/tests/test-helper.js b/tests/test-helper.js
@@ -1,10 +1,6 @@
 import resolver from './helpers/resolver';
-import { setResolver } from 'ember-qunit';
+import {
+  setResolver
+} from 'ember-qunit';
 
 setResolver(resolver);
-
-document.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>');
-
-QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container'});
-var containerVisibility = QUnit.urlParams.nocontainer ? 'hidden' : 'visible';
-document.getElementById('ember-testing-container').style.visibility = containerVisibility;
