From 46aaa97f7982493d8837e5d9d159d70cd1cfdb4a Mon Sep 17 00:00:00 2001
From: Robert Wagner <rwwagner90@gmail.com>
Date: Sun, 14 Jan 2018 10:54:35 -0500
Subject: [PATCH] Remove ember-window-mock dependency

---
 CHANGELOG.md                            |  3 +++
 addon/services/tour.js                  |  6 ++----
 package.json                            |  1 -
 tests/acceptance/ember-shepherd-test.js |  7 ++-----
 tests/unit/services/tour-test.js        |  5 -----
 yarn.lock                               | 13 +++----------
 6 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f7aad09..14eb544e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 We will list changes, especially breaking changes, between versions here.
 
+### **3.1.0**
+* Removed `ember-window-mock` dependency
+
 ### **3.0.0**
 * Removed `autoStart`, so this is a breaking change if you were relying on the tour to start itself.
 
diff --git a/addon/services/tour.js b/addon/services/tour.js
index 377b4d05..1473b666 100644
--- a/addon/services/tour.js
+++ b/addon/services/tour.js
@@ -2,7 +2,7 @@
 
 import { get, observer, set } from '@ember/object';
 import { isEmpty, isPresent } from '@ember/utils';
-import Service, { inject as service } from '@ember/service';
+import Service from '@ember/service';
 import Evented from '@ember/object/evented';
 import { run } from '@ember/runloop';
 import {
@@ -14,8 +14,6 @@ import {
 } from '../utils';
 
 export default Service.extend(Evented, {
-  window: service(),
-
   // Configuration Options
   confirmCancel: false,
   confirmCancelMessage: null,
@@ -228,7 +226,7 @@ export default Service.extend(Evented, {
       const cancelMessage = confirmCancelMessage || 'Are you sure you want to stop the tour?';
 
       const newCancelFunction = () => {
-        const stopTour = get(this, 'window').confirm(cancelMessage);
+        const stopTour = window.confirm(cancelMessage);
         if (stopTour) {
           cancelFunction();
         }
diff --git a/package.json b/package.json
index d9e7cf85..997a1751 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,6 @@
     "ember-cli-babel": "^6.6.0",
     "ember-cli-node-assets": "0.2.2",
     "ember-tether": "1.0.0-beta.0",
-    "ember-window-mock": "^0.2.1",
     "fastboot-transform": "^0.1.2",
     "tether-shepherd": "1.8.1"
   },
diff --git a/tests/acceptance/ember-shepherd-test.js b/tests/acceptance/ember-shepherd-test.js
index 2ba4cad2..1cce52fa 100644
--- a/tests/acceptance/ember-shepherd-test.js
+++ b/tests/acceptance/ember-shepherd-test.js
@@ -1,7 +1,6 @@
 import { click, find, findAll } from 'ember-native-dom-helpers';
 import { module, test } from 'qunit';
 import { visit } from '@ember/test-helpers';
-import { lookupWindow } from 'ember-window-mock';
 import { setupApplicationTest } from 'ember-qunit';
 import sinonTest from 'ember-sinon-qunit/test-support/test';
 import steps from '../data';
@@ -124,9 +123,7 @@ module('Acceptance | Tour functionality tests', function(hooks) {
       }
     }];
 
-    const window = lookupWindow(this);
-    const stub = this.stub(window, 'confirm');
-    stub.returns(true);
+    const spy = this.spy(window, 'confirm');
 
     await visit('/');
 
@@ -139,7 +136,7 @@ module('Acceptance | Tour functionality tests', function(hooks) {
 
     await click('.shepherd-open a.shepherd-cancel-link', document.documentElement);
 
-    assert.ok(stub.calledOnce);
+    assert.ok(spy.calledOnce);
   });
 
   test('Modal page contents', async function(assert) {
diff --git a/tests/unit/services/tour-test.js b/tests/unit/services/tour-test.js
index 91c8c493..705b3d1b 100644
--- a/tests/unit/services/tour-test.js
+++ b/tests/unit/services/tour-test.js
@@ -1,7 +1,6 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import EmberObject from '@ember/object';
-import { mockWindow } from 'ember-window-mock';
 import { run } from '@ember/runloop';
 import { getElementPosition, setPositionForHighlightElement } from 'ember-shepherd/utils';
 
@@ -37,10 +36,6 @@ const steps = [
 module('Unit | Service | tour', function(hooks) {
   setupTest(hooks);
 
-  hooks.beforeEach(function() {
-    mockWindow(this);
-  });
-
   test('it starts the tour when the `start` event is triggered', function(assert) {
     assert.expect(1);
 
diff --git a/yarn.lock b/yarn.lock
index c68f3873..05245edd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2347,9 +2347,9 @@ electron-to-chromium@^1.3.30:
   dependencies:
     electron-releases "^2.1.0"
 
-ember-assign-polyfill@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ember-assign-polyfill/-/ember-assign-polyfill-2.1.0.tgz#0d339284617548d1564c02cf7490ad9c021715fc"
+ember-assign-polyfill@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ember-assign-polyfill/-/ember-assign-polyfill-2.2.0.tgz#7953836e5ccd4da05b2493423d3efc00df80ca74"
   dependencies:
     ember-cli-babel "^6.8.2"
     ember-cli-version-checker "^2.0.0"
@@ -2956,13 +2956,6 @@ ember-try@^0.2.15:
     rsvp "^3.0.17"
     semver "^5.1.0"
 
-ember-window-mock@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/ember-window-mock/-/ember-window-mock-0.2.1.tgz#3b6a59f667f84ef2d019068d799322d424211132"
-  dependencies:
-    broccoli-funnel "^2.0.1"
-    ember-cli-babel "^6.6.0"
-
 encodeurl@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"