ui: Resolve bad rebase and add in KV test for change of GET for KVs (#5000)

ui-v2/app/routes/application.js

@@ -3,10 +3,14 @@ import { inject as service } from '@ember/service';
 import { hash } from 'rsvp';
 import { get } from '@ember/object';
 import { next } from '@ember/runloop';
+import { Promise } from 'rsvp';
+
+import WithBlockingActions from 'consul-ui/mixins/with-blocking-actions';
+
 const removeLoading = function($from) {
   return $from.classList.remove('ember-loading');
 };
-export default Route.extend({
+export default Route.extend(WithBlockingActions, {
   dom: service('dom'),
   init: function() {
     this._super(...arguments);

ui-v2/tests/unit/adapters/kv-test.js

@@ -85,11 +85,11 @@ module('Unit | Adapter | kv', function(hooks) {
       });
     });
     // not included in the above forEach as it's a slightly different concept
-    it('returns string KV object when calling queryRecord (or anything else) record', function() {
+    it('returns string KV object when calling queryRecord (or anything else) record', function(message) {
       const actual = adapter.dataForRequest({
         requestType: 'queryRecord',
       });
-      assert.equal(actual, null);
+      assert.deepEqual(actual, deep);
     });
   });
   test('methodForRequest returns the correct method', function(assert) {

ui-v2/tests/unit/routes/application-test.js

@@ -2,7 +2,14 @@ import { moduleFor, test } from 'ember-qunit';
 
 moduleFor('route:application', 'Unit | Route | application', {
   // Specify the other units that are required for this test.
-  needs: ['service:repository/dc', 'service:settings', 'service:dom'],
+  needs: [
+    'service:repository/dc',
+    'service:settings',
+    'service:feedback',
+    'service:flashMessages',
+    'service:logger',
+    'service:dom',
+  ],
 });
 
 test('it exists', function(assert) {