Merge pull request #48 from nypublicradio/point-to-api

point data requests to wnycAPI
nypublicradio · Jan 31, 2017 · 2be3a55 · 2be3a55
2 parents 87c7335 + 7956ce1
commit 2be3a55
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/app/discover/stories/adapter.js b/app/discover/stories/adapter.js
@@ -3,11 +3,10 @@ import DS from 'ember-data';
 import service from 'ember-service/inject';
 
 const { featureFlags } = ENV;
-const host = featureFlags['other-discover'] ? ENV.wnycAPI : ENV.wnycURL;
 const path = featureFlags['other-discover'] ? 'reco_proxy' : 'make_playlist';
 
 export default DS.JSONAPIAdapter.extend({
-  host,
+  host: ENV.wnycAPI,
   namespace: `api/v3/${path}/`,
   session: service(),
 

diff --git a/app/services/script-loader.js b/app/services/script-loader.js
@@ -80,7 +80,7 @@ function scriptURL(tag) {
   if (url.indexOf(origin) === 0) {
     return url;
   } else {
-    return `/api/v1/dynamic-script-loader/?url=${encodeURIComponent(canonicalize(url))}`;
+    return `${ENV.wnycAPI}/api/v1/dynamic-script-loader/?url=${encodeURIComponent(canonicalize(url))}`;
   }
 }
 

diff --git a/app/services/whats-on.js b/app/services/whats-on.js
@@ -4,14 +4,14 @@ import Service from 'ember-service';
 import get from 'ember-metal/get';
 import { canonicalize } from 'wnyc-web-client/services/script-loader';
 
-let { wnycURL } = ENV;
-wnycURL = canonicalize(wnycURL);
+let { wnycAPI } = ENV;
+wnycAPI = canonicalize(wnycAPI);
 
 export default Service.extend({
   endPoint: 'api/v1/whats_on/',
   isLive(pk) {
     let endPoint = get(this, 'endPoint');
-    let url = `${wnycURL}${endPoint}`;
+    let url = `${wnycAPI}${endPoint}`;
 
     return $.ajax(url).then(d => this._extractStatus(d, pk));
   },

diff --git a/mirage/config.js b/mirage/config.js
@@ -72,7 +72,7 @@ export default function() {
   this.get(`${baseUrl}/api/v3/channel/\*id`, 'api-response');
 
   let discoverPath = config.featureFlags['other-discover'] ? 'reco_proxy' : 'make_playlist';
-  this.get(`${baseUrl}/api/v3/${discoverPath}`, function(schema) {
+  this.get(`${config.wnycAPI}/api/v3/${discoverPath}`, function(schema) {
     let stories = schema.discoverStories.all().models;
 
     let data = stories.map(s => {

diff --git a/tests/acceptance/discover-test.js b/tests/acceptance/discover-test.js
@@ -328,7 +328,7 @@ skip('playlist request sends stories and tags in correct format', function(asser
           andThen(() => {
             click($('button:contains("Create Playlist")'));
             //
-            let url =[ENV.wnycURL, 'api/v3/make_playlist'].join("/");
+            let url =[ENV.wnycAPI, 'api/v3/make_playlist'].join("/");
 
             server.get(url, function(schema, request) {