From b767a8742291f464311f400e306e619f0e1d514b Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Thu, 9 Aug 2018 15:35:25 -0700
Subject: [PATCH] Update tests to handle region switching

---
 ui/tests/integration/task-log-test.js |  1 +
 ui/tests/unit/adapters/job-test.js    | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ui/tests/integration/task-log-test.js b/ui/tests/integration/task-log-test.js
index 5b2ddab25..563b0d632 100644
--- a/ui/tests/integration/task-log-test.js
+++ b/ui/tests/integration/task-log-test.js
@@ -56,6 +56,7 @@ moduleForComponent('task-log', 'Integration | Component | task log', {
     this.server = new Pretender(function() {
       this.get(`http://${HOST}/v1/client/fs/logs/:allocation_id`, handler);
       this.get('/v1/client/fs/logs/:allocation_id', handler);
+      this.get('/v1/regions', () => [200, {}, '[]']);
     });
   },
   afterEach() {
diff --git a/ui/tests/unit/adapters/job-test.js b/ui/tests/unit/adapters/job-test.js
index 9b96b45d1..9b091c33e 100644
--- a/ui/tests/unit/adapters/job-test.js
+++ b/ui/tests/unit/adapters/job-test.js
@@ -41,7 +41,13 @@ moduleForAdapter('job', 'Unit | Adapter | Job', {
     this.server.create('job', { id: 'job-2', namespaceId: 'some-namespace' });
 
     this.system = getOwner(this).lookup('service:system');
+
+    // Namespace, default region, and all regions are requests that all
+    // job requests depend on. Fetching them ahead of time means testing
+    // job adapter behavior in isolation.
     this.system.get('namespaces');
+    this.system.get('shouldIncludeRegion');
+    this.system.get('defaultRegion');
 
     // Reset the handledRequests array to avoid accounting for this
     // namespaces request everywhere.
@@ -83,8 +89,8 @@ test('When a namespace is set in localStorage but a job in the default namespace
 
     assert.deepEqual(
       pretender.handledRequests.mapBy('url'),
-      ['/v1/namespaces', `/v1/job/${jobName}`],
-      'The only requests made are /namespaces and /job/:id with no namespace query param'
+      [`/v1/job/${jobName}`],
+      'The only request made is /job/:id with no namespace query param'
     );
   });
 });
@@ -168,7 +174,7 @@ test('findAll can be watched', function(assert) {
 
   request();
   assert.equal(
-    pretender.handledRequests[1].url,
+    pretender.handledRequests[0].url,
     '/v1/jobs?index=1',
     'Second request is a blocking request for jobs'
   );
@@ -176,7 +182,7 @@ test('findAll can be watched', function(assert) {
   return wait().then(() => {
     request();
     assert.equal(
-      pretender.handledRequests[2].url,
+      pretender.handledRequests[1].url,
       '/v1/jobs?index=2',
       'Third request is a blocking request with an incremented index param'
     );