Merge pull request #5399 from bmac/rm-enabled-test

Remove unneeded feature flagged tests
emberjs · Mar 28, 2018 · 2a2c2a0 · 2a2c2a0
2 parents 9875086 + d475bc7
commit 2a2c2a0
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 1,207 deletions.
diff --git a/tests/integration/adapter/build-url-mixin-test.js b/tests/integration/adapter/build-url-mixin-test.js
@@ -4,7 +4,6 @@ import RSVP from 'rsvp';
 import { run } from '@ember/runloop';
 import setupStore from 'dummy/tests/helpers/store';
 import { pluralize } from 'ember-inflector';
-import { isEnabled } from 'ember-data/-private';
 
 import { module, test } from 'qunit';
 
@@ -44,19 +43,11 @@ module("integration/adapter/build-url-mixin - BuildURLMixin with RESTAdapter", {
 });
 
 function ajaxResponse(value) {
-  if (isEnabled('ds-improved-ajax')) {
-    adapter._makeRequest = function(request) {
-      passedUrl = request.url;
-
-      return run(RSVP, 'resolve', copy(value, true));
-    };
-  } else {
-    adapter.ajax = function(url, verb, hash) {
-      passedUrl = url;
-
-      return run(RSVP, 'resolve', copy(value, true));
-    };
-  }
+  adapter.ajax = function(url, verb, hash) {
+    passedUrl = url;
+
+    return run(RSVP, 'resolve', copy(value, true));
+  };
 }
 
 

diff --git a/tests/integration/adapter/json-api-adapter-test.js b/tests/integration/adapter/json-api-adapter-test.js
@@ -6,7 +6,6 @@ import { module, test } from 'qunit';
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
 
 import DS from 'ember-data';
-import { isEnabled } from 'ember-data/-private';
 
 let env, store, adapter;
 let passedUrl, passedVerb, passedHash;
@@ -90,27 +89,15 @@ function ajaxResponse(responses) {
   passedVerb = [];
   passedHash = [];
 
-  if (isEnabled('ds-improved-ajax')) {
-    adapter._makeRequest = function(request) {
-      index = counter++;
+  adapter.ajax = function(url, verb, hash) {
+    index = counter++;
 
-      passedUrl[index] = request.url;
-      passedVerb[index] = request.method;
-      passedHash[index] = request.data ? { data: request.data } : undefined;
+    passedUrl[index] = url;
+    passedVerb[index] = verb;
+    passedHash[index] = hash;
 
-      return run(RSVP, 'resolve', responses[index]);
-    };
-  } else {
-    adapter.ajax = function(url, verb, hash) {
-      index = counter++;
-
-      passedUrl[index] = url;
-      passedVerb[index] = verb;
-      passedHash[index] = hash;
-
-      return run(RSVP, 'resolve', responses[index]);
-    };
-  }
+    return run(RSVP, 'resolve', responses[index]);
+  };
 }
 
 test('find a single record', function(assert) {

diff --git a/tests/integration/adapter/rest-adapter-test.js b/tests/integration/adapter/rest-adapter-test.js
@@ -12,7 +12,6 @@ import { module, test } from 'qunit';
 import Pretender from "pretender";
 
 import DS from 'ember-data';
-import { isEnabled } from 'ember-data/-private';
 
 let env, store, adapter, Post, Comment, SuperUser;
 let passedUrl, passedVerb, passedHash;
@@ -52,23 +51,13 @@ module("integration/adapter/rest_adapter - REST Adapter", {
 });
 
 function ajaxResponse(value) {
-  if (isEnabled('ds-improved-ajax')) {
-    adapter._makeRequest = function(request) {
-      passedUrl = request.url;
-      passedVerb = request.method;
-      passedHash = request.data ? { data: request.data } : undefined;
+  adapter.ajax = function(url, verb, hash) {
+    passedUrl = url;
+    passedVerb = verb;
+    passedHash = hash;
 
-      return run(RSVP, 'resolve', copy(value, true));
-    };
-  } else {
-    adapter.ajax = function(url, verb, hash) {
-      passedUrl = url;
-      passedVerb = verb;
-      passedHash = hash;
-
-      return run(RSVP, 'resolve', copy(value, true));
-    };
-  }
+    return run(RSVP, 'resolve', copy(value, true));
+  };
 }
 
 function ajaxError(responseText, status = 400, headers = '') {
@@ -2562,46 +2551,3 @@ testInDebug("warns when an empty response is returned, though a valid stringifie
     assert.ok(/JSON/.test(reason.message));
   });
 });
-
-if (isEnabled('ds-improved-ajax')) {
-  testInDebug("The RESTAdapter should use `ajax` with a deprecation message when it is overridden by the user.", function(assert) {
-    assert.expect(2)
-
-    adapter.ajax = function(url, verb, hash) {
-      assert.ok(true, 'The ajax method should be called when it is overridden');
-      return { posts: { id: 1, name: "Rails is omakase" } };
-    };
-
-    assert.expectDeprecation(() => {
-      run(() => store.findRecord('post', 1));
-    }, /RESTAdapter#ajax has been deprecated/)
-  });
-
-
-  testInDebug("The RESTAdapter should use `ajaxOptions` with a deprecation message when it is overridden by the user.", function(assert) {
-    assert.expect(2)
-
-    ajaxResponse({ posts: { id: 1, name: "Rails is omakase" } });
-
-    let oldAjaxOptions = adapter.ajaxOptions;
-    adapter.ajaxOptions = function() {
-      assert.ok(true, 'The ajaxOptions method should be called when it is overridden');
-      return oldAjaxOptions.apply(this, arguments);
-    };
-
-    assert.expectDeprecation(() => {
-      run(() => store.findRecord('post', 1));
-    }, /RESTAdapter#ajaxOptions has been deprecated/)
-  });
-
-  test("_requestToJQueryAjaxHash works correctly for GET requests - GH-4445", function(assert) {
-    server.get('/posts/1', function(request) {
-      assert.equal(request.url, "/posts/1", "no query param is added to the GET request");
-
-      return [201, { "Content-Type": "application/json" }, JSON.stringify({ post: { id: 1 } })];
-    });
-
-    return run(() => store.findRecord('post', 1));
-  });
-
-}
diff --git a/tests/integration/references/belongs-to-test.js b/tests/integration/references/belongs-to-test.js
@@ -4,7 +4,6 @@ import { get } from '@ember/object';
 import DS from 'ember-data';
 import setupStore from 'dummy/tests/helpers/store';
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
-import { isEnabled } from 'ember-data/-private';
 import { module, test } from 'qunit';
 
 var env, Family;
@@ -240,50 +239,6 @@ testInDebug("push(record)", function(assert) {
   });
 });
 
-if (isEnabled('ds-overhaul-references')) {
-  testInDebug("push(record) logs a deprecation warning", function(assert) {
-    var done = assert.async();
-
-    var person, family;
-    run(function() {
-      person = env.store.push({
-        data: {
-          type: 'person',
-          id: 1,
-          relationships: {
-            family: {
-              data: { type: 'family', id: 1 }
-            }
-          }
-        }
-      });
-      family = env.store.push({
-        data: {
-          type: 'family',
-          id: 1,
-          attributes: {
-            name: "Coreleone"
-          }
-        }
-      });
-    });
-
-    var familyReference = person.belongsTo('family');
-
-    assert.expectDeprecation(() => {
-      run(function() {
-        familyReference.push(family).then(function(record) {
-          assert.ok(Family.detectInstance(record), "push resolves with the referenced record");
-          assert.equal(get(record, 'name'), "Coreleone", "name is set");
-          assert.equal(record, family);
-
-          done();
-        });
-      });
-    }, "BelongsToReference#push(DS.Model) is deprecated. Update relationship via `model.set('relationshipName', value)` instead.");
-  });
-}
-
 test("push(promise)", function(assert) {
   var done = assert.async();