From 707e0a19fa6bed657fc202773184dfad15ee0a3f Mon Sep 17 00:00:00 2001 From: Brian Whitton Date: Mon, 9 Jan 2017 12:04:08 -0500 Subject: [PATCH] renames app from overhaul to wnyc-web-client --- app/adapters/django-page.js | 2 +- app/authenticators/nypr.js | 2 +- app/bucket/adapter.js | 4 ++-- app/channel/index/route.js | 2 +- app/channel/page/route.js | 2 +- app/channel/route.js | 4 ++-- app/components/beta-trial/component.js | 4 ++-- app/components/comments-admin/component.js | 2 +- app/components/comments-form/component.js | 2 +- app/components/django-page/component.js | 6 +++--- app/components/forgot-pw/component.js | 2 +- app/components/google-ad/component.js | 2 +- app/components/listen-button/embedded/component.js | 2 +- app/components/nav-links/component.js | 4 ++-- .../persistent-player/progress-meter/component.js | 2 +- app/components/queue-button/embedded/component.js | 4 ++-- app/components/search-box/component.js | 2 +- app/components/site-chrome/component.js | 4 ++-- app/components/x-marquee/component.js | 2 +- app/discover/edit/topics/route.js | 2 +- app/helpers/is-external.js | 4 ++-- app/helpers/share-url.js | 2 +- app/index.html | 4 ++-- app/instance-initializers/beta-trial.js | 2 +- app/instance-initializers/link-handler.js | 4 ++-- app/instance-initializers/metrics.js | 2 +- app/lib/alien-dom.js | 2 +- app/lib/compat-hooks.js | 12 ++++++------ app/metrics-adapters/npr-analytics.js | 2 +- app/mixins/beta-actions.js | 2 +- app/routes/application.js | 2 +- app/routes/archived-shows.js | 2 +- app/routes/djangorendered.js | 8 ++++---- app/routes/index.js | 2 +- app/serializers/django-page.js | 2 +- app/services/bumper-state.js | 2 +- app/services/session.js | 2 +- app/services/whats-on.js | 4 ++-- app/shows/adapter.js | 2 +- app/shows/model.js | 2 +- app/shows/route.js | 2 +- app/story/model.js | 2 +- app/story/route.js | 2 +- app/stream/adapter.js | 2 +- app/stream/model.js | 2 +- app/stream/serializer.js | 2 +- app/transitions.js | 2 +- bower.json | 2 +- config/environment.js | 4 ++-- docs/prototype-report.html | 10 +++++----- lib/unobtrusive-loader/index.js | 4 ++-- mirage/config.js | 2 +- mirage/factories/django-page.js | 2 +- mirage/helpers/django-html.js | 6 +++--- package.json | 4 ++-- tests/acceptance/analytics-test.js | 4 ++-- tests/acceptance/archived-shows-test.js | 2 +- tests/acceptance/beta-trial-test.js | 10 +++++----- tests/acceptance/discover-metrics-test.js | 8 ++++---- tests/acceptance/discover-returning-user-test.js | 10 +++++----- tests/acceptance/discover-test.js | 8 ++++---- tests/acceptance/djangorendered-test.js | 12 ++++++------ tests/acceptance/history-test.js | 4 ++-- tests/acceptance/login-test.js | 4 ++-- tests/acceptance/paginating-show-listings-test.js | 8 ++++---- tests/acceptance/play-param-test.js | 6 +++--- tests/acceptance/playlist-test.js | 2 +- tests/acceptance/queue-test.js | 6 +++--- tests/acceptance/schedule-test.js | 2 +- tests/acceptance/settings-authenticated-test.js | 6 +++--- tests/acceptance/shows-test.js | 2 +- tests/acceptance/site-chrome-test.js | 2 +- tests/acceptance/streams-test.js | 2 +- tests/acceptance/viewing-show-test.js | 12 ++++++------ tests/acceptance/viewing-story-test.js | 12 ++++++------ tests/helpers/google-analytics-stub.js | 2 +- tests/helpers/setup-mirage-for-integration.js | 2 +- tests/index.html | 6 +++--- .../components/audio-metadata/component-test.js | 2 +- .../components/beta-trial/component-test.js | 4 ++-- .../client-infinite-scroll/component-test.js | 2 +- .../discover-playlist-story-info/component-test.js | 2 +- .../components/discover-playlist/component-test.js | 2 +- .../components/login-form/component-test.js | 2 +- tests/integration/components/nav-links-test.js | 4 ++-- .../persistent-player/notification/component-test.js | 2 +- tests/integration/components/share-button-test.js | 4 ++-- tests/integration/components/story-tease-test.js | 2 +- .../components/user-settings/component-test.js | 2 +- tests/pages/django-page.js | 4 ++-- tests/pages/history.js | 2 +- tests/pages/queue.js | 2 +- tests/pages/show.js | 2 +- tests/pages/story.js | 2 +- tests/unit/helpers/abbreviate-time-test.js | 2 +- tests/unit/helpers/array-contains-test.js | 2 +- tests/unit/helpers/camelize-keys-test.js | 2 +- tests/unit/helpers/can-change-volume-test.js | 2 +- tests/unit/helpers/humanize-duration-test.js | 2 +- tests/unit/helpers/in-experimental-group-test.js | 4 ++-- tests/unit/helpers/normalize-for-sorting-test.js | 2 +- tests/unit/helpers/numeric-duration-test.js | 2 +- tests/unit/helpers/producing-orgs-test.js | 2 +- tests/unit/helpers/share-metadata-test.js | 2 +- tests/unit/helpers/share-url-test.js | 2 +- tests/unit/helpers/song-metadata-test.js | 2 +- tests/unit/helpers/today-yesterday-or-date-test.js | 2 +- tests/unit/instance-initializers/beta-trial-test.js | 8 ++++---- .../instance-initializers/google-experiments-test.js | 2 +- .../unit/instance-initializers/link-handler-test.js | 6 +++--- tests/unit/metrics-adapters/npr-analytics-test.js | 2 +- tests/unit/mixins/beta-actions-test.js | 2 +- tests/unit/services/audio-test.js | 4 ++-- tests/unit/services/bumper-state-test.js | 4 ++-- tests/unit/services/listen-actions-test.js | 4 ++-- tests/unit/services/listen-queue-test.js | 2 +- tests/unit/services/metrics-test.js | 2 +- tests/unit/utils/animated-loading-icon-test.js | 2 +- 118 files changed, 203 insertions(+), 203 deletions(-) diff --git a/app/adapters/django-page.js b/app/adapters/django-page.js index ecb218af6..ae9bfcd2a 100644 --- a/app/adapters/django-page.js +++ b/app/adapters/django-page.js @@ -2,7 +2,7 @@ import DS from 'ember-data'; import fetch from 'fetch'; import ENV from '../config/environment'; import { isInDom } from '../lib/alien-dom'; -import { canonicalize } from 'overhaul/services/script-loader'; +import { canonicalize } from 'wnyc-web-client/services/script-loader'; export default DS.Adapter.extend({ findRecord(store, type, id /*, snapshot */) { diff --git a/app/authenticators/nypr.js b/app/authenticators/nypr.js index bc0018f73..3908e48a3 100644 --- a/app/authenticators/nypr.js +++ b/app/authenticators/nypr.js @@ -1,4 +1,4 @@ -import config from 'overhaul/config/environment'; +import config from 'wnyc-web-client/config/environment'; import Base from 'ember-simple-auth/authenticators/base'; import $ from 'jquery'; import RSVP from 'rsvp'; diff --git a/app/bucket/adapter.js b/app/bucket/adapter.js index c4dd89001..150c4eea6 100644 --- a/app/bucket/adapter.js +++ b/app/bucket/adapter.js @@ -1,5 +1,5 @@ -import ApplicationAdapter from 'overhaul/adapters/application'; -import config from 'overhaul/config/environment'; +import ApplicationAdapter from 'wnyc-web-client/adapters/application'; +import config from 'wnyc-web-client/config/environment'; export default ApplicationAdapter.extend({ pathForType: 'bucket', diff --git a/app/channel/index/route.js b/app/channel/index/route.js index e790fa8ce..6fb16c7b0 100644 --- a/app/channel/index/route.js +++ b/app/channel/index/route.js @@ -2,7 +2,7 @@ import Ember from 'ember'; import Route from 'ember-route'; import get from 'ember-metal/get'; import set from 'ember-metal/set'; -import ListingRouteMixin from 'overhaul/mixins/listing-route'; +import ListingRouteMixin from 'wnyc-web-client/mixins/listing-route'; const { Inflector } = Ember; const inflect = new Inflector(Inflector.defaultRules); diff --git a/app/channel/page/route.js b/app/channel/page/route.js index fcda73533..42df62c25 100644 --- a/app/channel/page/route.js +++ b/app/channel/page/route.js @@ -5,7 +5,7 @@ import set from 'ember-metal/set'; const { Inflector } = Ember; const inflect = new Inflector(Inflector.defaultRules); -import ListingRouteMixin from 'overhaul/mixins/listing-route'; +import ListingRouteMixin from 'wnyc-web-client/mixins/listing-route'; export default Route.extend(ListingRouteMixin, { model({ page_params }) { diff --git a/app/channel/route.js b/app/channel/route.js index d0213b175..86ce6d347 100644 --- a/app/channel/route.js +++ b/app/channel/route.js @@ -8,8 +8,8 @@ const { } = Ember; const { hash: waitFor } = Ember.RSVP; const inflector = new Inflector(Inflector.defaultRules); -import { retryFromServer } from 'overhaul/lib/compat-hooks'; -import PlayParamMixin from 'overhaul/mixins/play-param'; +import { retryFromServer } from 'wnyc-web-client/lib/compat-hooks'; +import PlayParamMixin from 'wnyc-web-client/mixins/play-param'; export default Route.extend(PlayParamMixin, { session: service(), diff --git a/app/components/beta-trial/component.js b/app/components/beta-trial/component.js index 42db8339b..1af115d01 100644 --- a/app/components/beta-trial/component.js +++ b/app/components/beta-trial/component.js @@ -1,6 +1,6 @@ import Ember from 'ember'; -import { addAlienLanding } from 'overhaul/lib/alien-dom'; -import config from 'overhaul/config/environment'; +import { addAlienLanding } from 'wnyc-web-client/lib/alien-dom'; +import config from 'wnyc-web-client/config/environment'; const { betaTrials: { betaInviteLanding, legacyNavLinkLanding } } = config; diff --git a/app/components/comments-admin/component.js b/app/components/comments-admin/component.js index e72c4f870..53ea5b818 100644 --- a/app/components/comments-admin/component.js +++ b/app/components/comments-admin/component.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import ENV from 'overhaul/config/environment'; +import ENV from 'wnyc-web-client/config/environment'; export default Ember.Component.extend({ cmsUrl: ENV.wnycAccountRoot, diff --git a/app/components/comments-form/component.js b/app/components/comments-form/component.js index c622742bb..eb1b579ea 100644 --- a/app/components/comments-form/component.js +++ b/app/components/comments-form/component.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import ENV from 'overhaul/config/environment'; +import ENV from 'wnyc-web-client/config/environment'; import fetch from 'fetch'; export default Ember.Component.extend({ diff --git a/app/components/django-page/component.js b/app/components/django-page/component.js index 13b682dea..6b4c7a0c5 100644 --- a/app/components/django-page/component.js +++ b/app/components/django-page/component.js @@ -1,9 +1,9 @@ import Ember from 'ember'; import service from 'ember-service/inject'; import ENV from '../../config/environment'; -import LegacySupportMixin from 'overhaul/mixins/legacy-support'; -import BetaActionsMixin from 'overhaul/mixins/beta-actions'; -import { canonicalize } from 'overhaul/services/script-loader'; +import LegacySupportMixin from 'wnyc-web-client/mixins/legacy-support'; +import BetaActionsMixin from 'wnyc-web-client/mixins/beta-actions'; +import { canonicalize } from 'wnyc-web-client/services/script-loader'; import { isInDom, embeddedComponentSetup, diff --git a/app/components/forgot-pw/component.js b/app/components/forgot-pw/component.js index aed228f10..9690105f2 100644 --- a/app/components/forgot-pw/component.js +++ b/app/components/forgot-pw/component.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import ENV from 'overhaul/config/environment'; +import ENV from 'wnyc-web-client/config/environment'; export default Ember.Component.extend({ ENV: ENV diff --git a/app/components/google-ad/component.js b/app/components/google-ad/component.js index 65e32d52e..39503a118 100644 --- a/app/components/google-ad/component.js +++ b/app/components/google-ad/component.js @@ -1,7 +1,7 @@ /*global wnyc*/ import Ember from 'ember'; import service from 'ember-service/inject'; -import ENV from 'overhaul/config/environment'; +import ENV from 'wnyc-web-client/config/environment'; const { get, set, diff --git a/app/components/listen-button/embedded/component.js b/app/components/listen-button/embedded/component.js index 4bcb1d2e2..78241ca6c 100644 --- a/app/components/listen-button/embedded/component.js +++ b/app/components/listen-button/embedded/component.js @@ -1,4 +1,4 @@ -import ListenButton from 'overhaul/components/listen-button/component'; +import ListenButton from 'wnyc-web-client/components/listen-button/component'; import computed from 'ember-computed'; import get from 'ember-metal/get'; import hbs from 'htmlbars-inline-precompile'; diff --git a/app/components/nav-links/component.js b/app/components/nav-links/component.js index abb789279..b64c0915e 100644 --- a/app/components/nav-links/component.js +++ b/app/components/nav-links/component.js @@ -1,6 +1,6 @@ import Ember from 'ember'; -import config from 'overhaul/config/environment'; -import { canonicalize } from 'overhaul/services/script-loader'; +import config from 'wnyc-web-client/config/environment'; +import { canonicalize } from 'wnyc-web-client/services/script-loader'; const { get, diff --git a/app/components/persistent-player/progress-meter/component.js b/app/components/persistent-player/progress-meter/component.js index 5e059c052..6b9f90500 100644 --- a/app/components/persistent-player/progress-meter/component.js +++ b/app/components/persistent-player/progress-meter/component.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import { findTouchById, isSimulatedMouseEvent } from 'overhaul/lib/touch-utils'; +import { findTouchById, isSimulatedMouseEvent } from 'wnyc-web-client/lib/touch-utils'; const { Component, computed, get, set } = Ember; const { htmlSafe } = Ember.String; diff --git a/app/components/queue-button/embedded/component.js b/app/components/queue-button/embedded/component.js index 7e030fdd8..e3c975206 100644 --- a/app/components/queue-button/embedded/component.js +++ b/app/components/queue-button/embedded/component.js @@ -1,7 +1,7 @@ -import QueueButton from 'overhaul/components/queue-button/component'; +import QueueButton from 'wnyc-web-client/components/queue-button/component'; import computed from 'ember-computed'; import get from 'ember-metal/get'; -import layout from 'overhaul/components/queue-button/template'; +import layout from 'wnyc-web-client/components/queue-button/template'; function wnycEmbeddedAttr() { return computed('embeddedAttrs', { diff --git a/app/components/search-box/component.js b/app/components/search-box/component.js index 8d3f65b8f..d4ed67f6f 100644 --- a/app/components/search-box/component.js +++ b/app/components/search-box/component.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import config from 'overhaul/config/environment'; +import config from 'wnyc-web-client/config/environment'; export default Ember.Component.extend({ svgURL: config.wnycSvgURL diff --git a/app/components/site-chrome/component.js b/app/components/site-chrome/component.js index 36b7a129e..b05e41e48 100644 --- a/app/components/site-chrome/component.js +++ b/app/components/site-chrome/component.js @@ -1,7 +1,7 @@ import Component from 'ember-component'; import service from 'ember-service/inject'; -import BetaActionsMixin from 'overhaul/mixins/beta-actions'; -import config from 'overhaul/config/environment'; +import BetaActionsMixin from 'wnyc-web-client/mixins/beta-actions'; +import config from 'wnyc-web-client/config/environment'; import { or } from 'ember-computed'; export default Component.extend(BetaActionsMixin, { diff --git a/app/components/x-marquee/component.js b/app/components/x-marquee/component.js index 728fc5f40..bc3e8d9f8 100644 --- a/app/components/x-marquee/component.js +++ b/app/components/x-marquee/component.js @@ -1,5 +1,5 @@ import Component from 'ember-component'; -import { imageTemplate } from 'overhaul/helpers/image-template'; +import { imageTemplate } from 'wnyc-web-client/helpers/image-template'; import { htmlSafe } from 'ember-string'; import get from 'ember-metal/get'; import set from 'ember-metal/set'; diff --git a/app/discover/edit/topics/route.js b/app/discover/edit/topics/route.js index 9ce7e080b..851df6949 100644 --- a/app/discover/edit/topics/route.js +++ b/app/discover/edit/topics/route.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import config from 'overhaul/config/environment'; +import config from 'wnyc-web-client/config/environment'; export default Ember.Route.extend({ discoverPrefs: Ember.inject.service(), diff --git a/app/helpers/is-external.js b/app/helpers/is-external.js index eeaa963f1..eecebd189 100644 --- a/app/helpers/is-external.js +++ b/app/helpers/is-external.js @@ -1,6 +1,6 @@ -import ENV from 'overhaul/config/environment'; +import ENV from 'wnyc-web-client/config/environment'; import { helper } from 'ember-helper'; -import { canonicalize } from 'overhaul/services/script-loader'; +import { canonicalize } from 'wnyc-web-client/services/script-loader'; let { wnycURL } = ENV; wnycURL = canonicalize(wnycURL); diff --git a/app/helpers/share-url.js b/app/helpers/share-url.js index 5362baa25..1a95d8a44 100644 --- a/app/helpers/share-url.js +++ b/app/helpers/share-url.js @@ -1,5 +1,5 @@ import { helper } from 'ember-helper'; -import { urlEncode } from 'overhaul/helpers/url-encode'; +import { urlEncode } from 'wnyc-web-client/helpers/url-encode'; export function shareUrl([destination, metadata]) { metadata = metadata || {}; diff --git a/app/index.html b/app/index.html index 74504c432..4167442ac 100644 --- a/app/index.html +++ b/app/index.html @@ -10,7 +10,7 @@ {{content-for "head"}} - + {{content-for "head-footer"}} @@ -18,7 +18,7 @@ {{content-for "body"}} - + {{content-for "body-footer"}} diff --git a/app/instance-initializers/beta-trial.js b/app/instance-initializers/beta-trial.js index b3a3fa176..cc51317ac 100644 --- a/app/instance-initializers/beta-trial.js +++ b/app/instance-initializers/beta-trial.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import config from 'overhaul/config/environment'; +import config from 'wnyc-web-client/config/environment'; export function chooseBetaPayload() { let beta; diff --git a/app/instance-initializers/link-handler.js b/app/instance-initializers/link-handler.js index 700e0fc9b..fdce1b8cc 100644 --- a/app/instance-initializers/link-handler.js +++ b/app/instance-initializers/link-handler.js @@ -1,7 +1,7 @@ // based on https://github.com/intercom/ember-href-to/blob/master/app/instance-initializers/browser/ember-href-to.js -import ENV from 'overhaul/config/environment'; +import ENV from 'wnyc-web-client/config/environment'; import Ember from 'ember'; -import { canonicalize } from 'overhaul/services/script-loader'; +import { canonicalize } from 'wnyc-web-client/services/script-loader'; const { $ } = Ember; let { wnycURL } = ENV; wnycURL = canonicalize(wnycURL); diff --git a/app/instance-initializers/metrics.js b/app/instance-initializers/metrics.js index b23c5ac6f..c01fbee21 100644 --- a/app/instance-initializers/metrics.js +++ b/app/instance-initializers/metrics.js @@ -1,4 +1,4 @@ -import ENV from 'overhaul/config/environment'; +import ENV from 'wnyc-web-client/config/environment'; const { googleAnalyticsKey, diff --git a/app/lib/alien-dom.js b/app/lib/alien-dom.js index e5f2de1fd..bf7ac16f5 100644 --- a/app/lib/alien-dom.js +++ b/app/lib/alien-dom.js @@ -1,4 +1,4 @@ -import config from 'overhaul/config/environment'; +import config from 'wnyc-web-client/config/environment'; import Ember from 'ember'; // The Alien DOM is a DOM that exists beyond the reaches of an Ember app's diff --git a/app/lib/compat-hooks.js b/app/lib/compat-hooks.js index f487879e0..9bc46c1c4 100644 --- a/app/lib/compat-hooks.js +++ b/app/lib/compat-hooks.js @@ -7,10 +7,10 @@ out of the old JS. */ import Ember from 'ember'; -import config from 'overhaul/config/environment'; -import { removeAlienListeners, assign } from 'overhaul/lib/alien-dom'; -import { runOnce } from 'overhaul/services/legacy-loader'; -import { canonicalize } from 'overhaul/services/script-loader'; +import config from 'wnyc-web-client/config/environment'; +import { removeAlienListeners, assign } from 'wnyc-web-client/lib/alien-dom'; +import { runOnce } from 'wnyc-web-client/services/legacy-loader'; +import { canonicalize } from 'wnyc-web-client/services/script-loader'; const { $, get } = Ember; export function homepageCleanup(element = document.body) { @@ -129,9 +129,9 @@ export function serializeInlineDoc(inlineDoc) { // we get problems from recursive ember views and ember trying to boot again toClean.push(...inlineDoc.querySelectorAll('.ember-view')); toClean.push(inlineDoc.querySelector('script[src*="assets/vendor"]')); - toClean.push(inlineDoc.querySelector('script[src*="assets/overhaul"]')); + toClean.push(inlineDoc.querySelector('script[src*="assets/wnyc-web-client"]')); toClean.push(inlineDoc.querySelector('link[href*="assets/vendor"]')); - toClean.push(inlineDoc.querySelector('link[href*="assets/overhaul"]')); + toClean.push(inlineDoc.querySelector('link[href*="assets/wnyc-web-client"]')); // any included google ad scripts have also already run, so clean them out so // see errors from intializing ads in occupied divs toClean.push(...inlineDoc.querySelectorAll('.google-ads')); diff --git a/app/metrics-adapters/npr-analytics.js b/app/metrics-adapters/npr-analytics.js index e559aa6a0..7b9e747be 100644 --- a/app/metrics-adapters/npr-analytics.js +++ b/app/metrics-adapters/npr-analytics.js @@ -1,5 +1,5 @@ import BaseAdapter from 'ember-metrics/metrics-adapters/base'; -import { siteName } from 'overhaul/config/environment'; +import { siteName } from 'wnyc-web-client/config/environment'; import $ from 'jquery'; const DEFAULT_NPR_VALS = ['NYPR', ...Array(7), siteName, null, document.title, ...Array(3)]; diff --git a/app/mixins/beta-actions.js b/app/mixins/beta-actions.js index 38f87938f..340ea34ff 100644 --- a/app/mixins/beta-actions.js +++ b/app/mixins/beta-actions.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import config from 'overhaul/config/environment'; +import config from 'wnyc-web-client/config/environment'; let { wnycURL } = config; diff --git a/app/routes/application.js b/app/routes/application.js index 84d11b710..a1f22276c 100644 --- a/app/routes/application.js +++ b/app/routes/application.js @@ -1,6 +1,6 @@ import Route from 'ember-route'; import get from 'ember-metal/get'; -import config from 'overhaul/config/environment'; +import config from 'wnyc-web-client/config/environment'; import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin'; import service from 'ember-service/inject'; diff --git a/app/routes/archived-shows.js b/app/routes/archived-shows.js index 7fab16281..d96951f4f 100644 --- a/app/routes/archived-shows.js +++ b/app/routes/archived-shows.js @@ -1,6 +1,6 @@ import Route from 'ember-route'; //import RSVP from 'rsvp'; -import ENV from 'overhaul/config/environment'; +import ENV from 'wnyc-web-client/config/environment'; export default Route.extend({ titleToken: 'More Shows', diff --git a/app/routes/djangorendered.js b/app/routes/djangorendered.js index 15aeb3ccb..9c913d752 100644 --- a/app/routes/djangorendered.js +++ b/app/routes/djangorendered.js @@ -1,10 +1,10 @@ -import ENV from 'overhaul/config/environment'; +import ENV from 'wnyc-web-client/config/environment'; import Route from 'ember-route'; import get from 'ember-metal/get'; import service from 'ember-service/inject'; -import { retryFromServer } from 'overhaul/lib/compat-hooks'; -import { beforeTeardown } from 'overhaul/lib/compat-hooks'; -import PlayParamMixin from 'overhaul/mixins/play-param'; +import { retryFromServer } from 'wnyc-web-client/lib/compat-hooks'; +import { beforeTeardown } from 'wnyc-web-client/lib/compat-hooks'; +import PlayParamMixin from 'wnyc-web-client/mixins/play-param'; export default Route.extend(PlayParamMixin, { queryParams: { diff --git a/app/routes/index.js b/app/routes/index.js index 2a937e683..be806aa10 100644 --- a/app/routes/index.js +++ b/app/routes/index.js @@ -1,6 +1,6 @@ import Ember from 'ember'; import service from 'ember-service/inject'; -import PlayParamMixin from 'overhaul/mixins/play-param'; +import PlayParamMixin from 'wnyc-web-client/mixins/play-param'; import rsvp from 'rsvp'; const { hash } = rsvp; const { get } = Ember; diff --git a/app/serializers/django-page.js b/app/serializers/django-page.js index 9dbb32460..56e6ca0d0 100644 --- a/app/serializers/django-page.js +++ b/app/serializers/django-page.js @@ -1,6 +1,6 @@ import DS from 'ember-data'; import Ember from 'ember'; -import { serializeInlineDoc } from 'overhaul/lib/compat-hooks'; +import { serializeInlineDoc } from 'wnyc-web-client/lib/compat-hooks'; export default DS.Serializer.extend({ normalizeResponse(store, primaryModelClass, payload, id /*, requestType */) { diff --git a/app/services/bumper-state.js b/app/services/bumper-state.js index 96b0cd4cf..4c376885d 100644 --- a/app/services/bumper-state.js +++ b/app/services/bumper-state.js @@ -2,7 +2,7 @@ import Ember from 'ember'; import service from 'ember-service/inject'; import computed, { readOnly, not } from 'ember-computed'; import get, { getProperties } from 'ember-metal/get'; -import ENV from 'overhaul/config/environment'; +import ENV from 'wnyc-web-client/config/environment'; export default Ember.Service.extend({ init() { diff --git a/app/services/session.js b/app/services/session.js index 8425f4bcb..02aac1c22 100644 --- a/app/services/session.js +++ b/app/services/session.js @@ -1,5 +1,5 @@ import SessionService from 'ember-simple-auth/services/session'; -import config from 'overhaul/config/environment'; +import config from 'wnyc-web-client/config/environment'; import RSVP from 'rsvp'; import fetch from 'fetch'; diff --git a/app/services/whats-on.js b/app/services/whats-on.js index 9d2cf4225..db349c40d 100644 --- a/app/services/whats-on.js +++ b/app/services/whats-on.js @@ -1,8 +1,8 @@ -import ENV from 'overhaul/config/environment'; +import ENV from 'wnyc-web-client/config/environment'; import $ from 'jquery'; import Service from 'ember-service'; import get from 'ember-metal/get'; -import { canonicalize } from 'overhaul/services/script-loader'; +import { canonicalize } from 'wnyc-web-client/services/script-loader'; let { wnycURL } = ENV; wnycURL = canonicalize(wnycURL); diff --git a/app/shows/adapter.js b/app/shows/adapter.js index 065a43b6b..98a02fc78 100644 --- a/app/shows/adapter.js +++ b/app/shows/adapter.js @@ -1,4 +1,4 @@ -import ApplicationAdapter from 'overhaul/adapters/application'; +import ApplicationAdapter from 'wnyc-web-client/adapters/application'; export default ApplicationAdapter.extend({ buildURL() { diff --git a/app/shows/model.js b/app/shows/model.js index 6aebd6ebc..847f9aff8 100644 --- a/app/shows/model.js +++ b/app/shows/model.js @@ -1,4 +1,4 @@ -import ChannelModel from 'overhaul/channel/model'; +import ChannelModel from 'wnyc-web-client/channel/model'; export default ChannelModel; diff --git a/app/shows/route.js b/app/shows/route.js index eb65e5118..46b29b75e 100644 --- a/app/shows/route.js +++ b/app/shows/route.js @@ -1,6 +1,6 @@ import Route from 'ember-route'; import RSVP from 'rsvp'; -import ENV from 'overhaul/config/environment'; +import ENV from 'wnyc-web-client/config/environment'; export default Route.extend({ titleToken: 'All Shows, Podcasts and Programs', diff --git a/app/story/model.js b/app/story/model.js index b1dbd9e5e..25c09a3ad 100644 --- a/app/story/model.js +++ b/app/story/model.js @@ -4,7 +4,7 @@ import ENV from '../config/environment'; import get from 'ember-metal/get'; import computed from 'ember-computed'; import parseAnalyticsCode from '../utils/analytics-code-parser'; -import { shareMetadata } from 'overhaul/helpers/share-metadata'; +import { shareMetadata } from 'wnyc-web-client/helpers/share-metadata'; const { attr, Model } = DS; export default Model.extend({ diff --git a/app/story/route.js b/app/story/route.js index 4a24aef16..72258fea6 100644 --- a/app/story/route.js +++ b/app/story/route.js @@ -1,6 +1,6 @@ import Ember from 'ember'; import service from 'ember-service/inject'; -import PlayParamMixin from 'overhaul/mixins/play-param'; +import PlayParamMixin from 'wnyc-web-client/mixins/play-param'; const { get } = Ember; const { hash: waitFor } = Ember.RSVP; diff --git a/app/stream/adapter.js b/app/stream/adapter.js index d250a9f4c..f59d981cc 100644 --- a/app/stream/adapter.js +++ b/app/stream/adapter.js @@ -1,4 +1,4 @@ -import config from 'overhaul/config/environment'; +import config from 'wnyc-web-client/config/environment'; import DS from 'ember-data'; import Ember from 'ember'; const { hash } = Ember.RSVP; diff --git a/app/stream/model.js b/app/stream/model.js index a57b20a60..c964e4bd6 100644 --- a/app/stream/model.js +++ b/app/stream/model.js @@ -2,7 +2,7 @@ import Model from 'ember-data/model'; import attr from 'ember-data/attr'; import { belongsTo } from 'ember-data/relationships'; import computed, { readOnly } from 'ember-computed'; -import { shareMetadata } from 'overhaul/helpers/share-metadata'; +import { shareMetadata } from 'wnyc-web-client/helpers/share-metadata'; export default Model.extend({ audioType: 'stream', diff --git a/app/stream/serializer.js b/app/stream/serializer.js index 7bdbc5457..959216a1e 100644 --- a/app/stream/serializer.js +++ b/app/stream/serializer.js @@ -1,5 +1,5 @@ import DS from 'ember-data'; -import { camelizeKeys } from 'overhaul/helpers/camelize-keys'; +import { camelizeKeys } from 'wnyc-web-client/helpers/camelize-keys'; export default DS.JSONAPISerializer.extend({ keyForAttribute(key) { diff --git a/app/transitions.js b/app/transitions.js index 4a38f4c64..3978bf3f9 100644 --- a/app/transitions.js +++ b/app/transitions.js @@ -1,4 +1,4 @@ -import config from '../overhaul/config/environment'; +import config from '../wnyc-web-client/config/environment'; function duration(time) { return (config.environment === 'test' ? 0 : time); diff --git a/bower.json b/bower.json index 3deb13c5d..79cc5b3d5 100644 --- a/bower.json +++ b/bower.json @@ -1,5 +1,5 @@ { - "name": "overhaul", + "name": "wnyc-web-client", "dependencies": { "ember": "~2.9.0", "ember-cli-shims": "0.1.3", diff --git a/config/environment.js b/config/environment.js index 31642df57..2eb0d0215 100644 --- a/config/environment.js +++ b/config/environment.js @@ -9,7 +9,7 @@ module.exports = function(environment) { } var ENV = { - modulePrefix: 'overhaul', + modulePrefix: 'wnyc-web-client', environment: environment, rootURL: '/', locationType: 'auto', @@ -51,7 +51,7 @@ module.exports = function(environment) { /https?:\/\/(demo2-wnyc)\.wqxr\.org/ ], whitelistUrls: [ - /https?:\/\/(static|demo-static)\.wnyc\.org\/assets\/(vendor|overhaul)-.*/, + /https?:\/\/(static|demo-static)\.wnyc\.org\/assets\/(vendor|wnyc-web-client)-.*/, /https?:\/\/media\.wnyc\.org\/static\/.*\.js/, /https?:\/\/((demo2-wnyc)\.)?wqxr\.org\/static\/.*\.js/ ], diff --git a/docs/prototype-report.html b/docs/prototype-report.html index 6275449f7..751a4b794 100644 --- a/docs/prototype-report.html +++ b/docs/prototype-report.html @@ -100,7 +100,7 @@

Ember Application Tour

This section highlights several important pieces of your Ember application that make the hybrid architecture - possible. The application is in the overhaul + possible. The application is in the wnyc-web-client subdirectory on the branch efaulkner/prototype in the repo git.wnyc.net:puppysite.

Prior to this work, you had two Ember apps embedded in the - site: overhaul-story and overhaul-listings. I absorbed - overhaul-story into the new Ember app in order to + site: wnyc-web-client-story and wnyc-web-client-listings. I absorbed + wnyc-web-client-story into the new Ember app in order to demonstrate how it should work. You will need to do the same with the listings app.In the process - of porting overhaul-story, I refactored its data flow to + of porting wnyc-web-client-story, I refactored its data flow to bring it closer to Ember standard conventions and reduce the API surface area between it and your legacy Javascript. It would be helpful to review these changes and try to emulate @@ -339,7 +339,7 @@

Update build and deployment code

I recommend dropping the build code - in grunt/overhaul.js. Use stock ember-cli to + in grunt/wnyc-web-client.js. Use stock ember-cli to build the Ember app. Use ember-cli-deploy diff --git a/lib/unobtrusive-loader/index.js b/lib/unobtrusive-loader/index.js index c77cea736..860e322aa 100644 --- a/lib/unobtrusive-loader/index.js +++ b/lib/unobtrusive-loader/index.js @@ -27,9 +27,9 @@ module.exports = { }), concat(tree, { header: '(function(define, require, requireModule, requirejs, runningTests){ ', - inputFiles: ['assets/overhaul.js'], + inputFiles: ['assets/wnyc-web-client.js'], footer: '})(WNYC_EMBER_LOADER.define, WNYC_EMBER_LOADER.require, WNYC_EMBER_LOADER.requireModule, WNYC_EMBER_LOADER.requirejs, WNYC_EMBER_LOADER.runningTests);', - outputFile: 'assets/overhaul.js' + outputFile: 'assets/wnyc-web-client.js' }) ], { overwrite: true }); } else { diff --git a/mirage/config.js b/mirage/config.js index c966e658e..a9cfdc5f0 100644 --- a/mirage/config.js +++ b/mirage/config.js @@ -1,4 +1,4 @@ -import config from 'overhaul/config/environment'; +import config from 'wnyc-web-client/config/environment'; import { Response } from 'ember-cli-mirage'; // Mirage is diabled by default when using --proxy diff --git a/mirage/factories/django-page.js b/mirage/factories/django-page.js index 33afe2c3d..fd08a2d0f 100644 --- a/mirage/factories/django-page.js +++ b/mirage/factories/django-page.js @@ -1,5 +1,5 @@ import { Factory } from 'ember-cli-mirage'; -import serialize from 'overhaul/mirage/utils/serialize'; +import serialize from 'wnyc-web-client/mirage/utils/serialize'; export default Factory.extend({ id: '/', diff --git a/mirage/helpers/django-html.js b/mirage/helpers/django-html.js index f3ad932b9..7f5dd3ed0 100644 --- a/mirage/helpers/django-html.js +++ b/mirage/helpers/django-html.js @@ -133,7 +133,7 @@ var HTML = ` href="/atomfeeds/tags/right_to_die"/> - + @@ -161,7 +161,7 @@ var HTML = ` - + - + - + {{content-for "body-footer"}} diff --git a/tests/integration/components/audio-metadata/component-test.js b/tests/integration/components/audio-metadata/component-test.js index ea2a5de83..918b4ae0f 100644 --- a/tests/integration/components/audio-metadata/component-test.js +++ b/tests/integration/components/audio-metadata/component-test.js @@ -1,6 +1,6 @@ import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import { setBreakpointForIntegrationTest } from 'overhaul/tests/helpers/responsive'; +import { setBreakpointForIntegrationTest } from 'wnyc-web-client/tests/helpers/responsive'; moduleForComponent('persistent-player.audio-metadata', 'Integration | Component | audio metadata', { diff --git a/tests/integration/components/beta-trial/component-test.js b/tests/integration/components/beta-trial/component-test.js index 51d39dbc5..d524f03d0 100644 --- a/tests/integration/components/beta-trial/component-test.js +++ b/tests/integration/components/beta-trial/component-test.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import { generateBetaTrial } from 'overhaul/tests/helpers/beta'; +import { generateBetaTrial } from 'wnyc-web-client/tests/helpers/beta'; import { moduleForComponent, test } from 'ember-qunit'; -import { resetHTML, appendIfNot } from 'overhaul/tests/helpers/html'; +import { resetHTML, appendIfNot } from 'wnyc-web-client/tests/helpers/html'; import hbs from 'htmlbars-inline-precompile'; moduleForComponent('beta-trial', 'Integration | Component | beta trial', { diff --git a/tests/integration/components/client-infinite-scroll/component-test.js b/tests/integration/components/client-infinite-scroll/component-test.js index 7ba58b623..94d2b14f9 100644 --- a/tests/integration/components/client-infinite-scroll/component-test.js +++ b/tests/integration/components/client-infinite-scroll/component-test.js @@ -1,6 +1,6 @@ import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import startMirage from 'overhaul/tests/helpers/setup-mirage-for-integration'; +import startMirage from 'wnyc-web-client/tests/helpers/setup-mirage-for-integration'; moduleForComponent('client-infinite-scroll', 'Integration | Component | client infinite scroll', { integration: true, diff --git a/tests/integration/components/discover-playlist-story-info/component-test.js b/tests/integration/components/discover-playlist-story-info/component-test.js index d7af99ede..88d76bf5e 100644 --- a/tests/integration/components/discover-playlist-story-info/component-test.js +++ b/tests/integration/components/discover-playlist-story-info/component-test.js @@ -1,6 +1,6 @@ import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import startMirage from 'overhaul/tests/helpers/setup-mirage-for-integration'; +import startMirage from 'wnyc-web-client/tests/helpers/setup-mirage-for-integration'; import wait from 'ember-test-helpers/wait'; import moment from 'moment'; diff --git a/tests/integration/components/discover-playlist/component-test.js b/tests/integration/components/discover-playlist/component-test.js index 96572605a..744725698 100644 --- a/tests/integration/components/discover-playlist/component-test.js +++ b/tests/integration/components/discover-playlist/component-test.js @@ -1,7 +1,7 @@ import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import Ember from 'ember'; -import startMirage from 'overhaul/tests/helpers/setup-mirage-for-integration'; +import startMirage from 'wnyc-web-client/tests/helpers/setup-mirage-for-integration'; import wait from 'ember-test-helpers/wait'; moduleForComponent('discover-playlist', 'Integration | Component | discover playlist', { diff --git a/tests/integration/components/login-form/component-test.js b/tests/integration/components/login-form/component-test.js index 4d848c192..98cc5518d 100644 --- a/tests/integration/components/login-form/component-test.js +++ b/tests/integration/components/login-form/component-test.js @@ -1,6 +1,6 @@ import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import LoginForm from 'overhaul/components/login-form/component'; +import LoginForm from 'wnyc-web-client/components/login-form/component'; moduleForComponent('login-form', 'Integration | Component | login form', { integration: true, diff --git a/tests/integration/components/nav-links-test.js b/tests/integration/components/nav-links-test.js index 6a308d4fe..6e90942d0 100644 --- a/tests/integration/components/nav-links-test.js +++ b/tests/integration/components/nav-links-test.js @@ -1,7 +1,7 @@ -import config from 'overhaul/config/environment'; +import config from 'wnyc-web-client/config/environment'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import { canonicalize } from 'overhaul/services/script-loader'; +import { canonicalize } from 'wnyc-web-client/services/script-loader'; let { wnycURL } = config; wnycURL = canonicalize(wnycURL); diff --git a/tests/integration/components/persistent-player/notification/component-test.js b/tests/integration/components/persistent-player/notification/component-test.js index a937eb6ac..aa098f415 100644 --- a/tests/integration/components/persistent-player/notification/component-test.js +++ b/tests/integration/components/persistent-player/notification/component-test.js @@ -1,5 +1,5 @@ import { moduleForComponent, test } from 'ember-qunit'; -import startMirage from 'overhaul/tests/helpers/setup-mirage-for-integration'; +import startMirage from 'wnyc-web-client/tests/helpers/setup-mirage-for-integration'; import hbs from 'htmlbars-inline-precompile'; import Ember from 'ember'; diff --git a/tests/integration/components/share-button-test.js b/tests/integration/components/share-button-test.js index 4e2ae40bc..45e08be52 100644 --- a/tests/integration/components/share-button-test.js +++ b/tests/integration/components/share-button-test.js @@ -1,8 +1,8 @@ import { moduleForComponent, test } from 'ember-qunit'; import wait from 'ember-test-helpers/wait'; import hbs from 'htmlbars-inline-precompile'; -import { urlEncode } from 'overhaul/helpers/url-encode'; -import { shareMetadata } from 'overhaul/helpers/share-metadata'; +import { urlEncode } from 'wnyc-web-client/helpers/url-encode'; +import { shareMetadata } from 'wnyc-web-client/helpers/share-metadata'; moduleForComponent('share-button', 'Integration | Component | share button', { integration: true diff --git a/tests/integration/components/story-tease-test.js b/tests/integration/components/story-tease-test.js index 6fb2bf614..81c9d345b 100644 --- a/tests/integration/components/story-tease-test.js +++ b/tests/integration/components/story-tease-test.js @@ -1,6 +1,6 @@ import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; -import startMirage from 'overhaul/tests/helpers/setup-mirage-for-integration'; +import startMirage from 'wnyc-web-client/tests/helpers/setup-mirage-for-integration'; import { faker } from 'ember-cli-mirage'; moduleForComponent('story-tease', 'Integration | Component | story tease', { diff --git a/tests/integration/components/user-settings/component-test.js b/tests/integration/components/user-settings/component-test.js index d41bb3c73..27d9506fb 100644 --- a/tests/integration/components/user-settings/component-test.js +++ b/tests/integration/components/user-settings/component-test.js @@ -1,5 +1,5 @@ import { moduleForComponent, test } from 'ember-qunit'; -import startMirage from 'overhaul/tests/helpers/setup-mirage-for-integration'; +import startMirage from 'wnyc-web-client/tests/helpers/setup-mirage-for-integration'; import hbs from 'htmlbars-inline-precompile'; const sessionStub = Ember.Service.extend({ diff --git a/tests/pages/django-page.js b/tests/pages/django-page.js index f80846e9e..b0aa83591 100644 --- a/tests/pages/django-page.js +++ b/tests/pages/django-page.js @@ -1,5 +1,5 @@ -import PageObject from 'overhaul/tests/page-object'; -import { appendHTML } from 'overhaul/tests/helpers/html'; +import PageObject from 'wnyc-web-client/tests/page-object'; +import { appendHTML } from 'wnyc-web-client/tests/helpers/html'; let { visitable, diff --git a/tests/pages/history.js b/tests/pages/history.js index fa80f66f5..56949c632 100644 --- a/tests/pages/history.js +++ b/tests/pages/history.js @@ -1,4 +1,4 @@ -import PageObject from 'overhaul/tests/page-object'; +import PageObject from 'wnyc-web-client/tests/page-object'; let { visitable, diff --git a/tests/pages/queue.js b/tests/pages/queue.js index 72921b45c..87ce4167d 100644 --- a/tests/pages/queue.js +++ b/tests/pages/queue.js @@ -1,4 +1,4 @@ -import PageObject from 'overhaul/tests/page-object'; +import PageObject from 'wnyc-web-client/tests/page-object'; let { visitable, diff --git a/tests/pages/show.js b/tests/pages/show.js index a3f86772b..b57ae0965 100644 --- a/tests/pages/show.js +++ b/tests/pages/show.js @@ -1,4 +1,4 @@ -import PageObject from 'overhaul/tests/page-object'; +import PageObject from 'wnyc-web-client/tests/page-object'; let { visitable, diff --git a/tests/pages/story.js b/tests/pages/story.js index d5b487641..09942d0ae 100644 --- a/tests/pages/story.js +++ b/tests/pages/story.js @@ -1,4 +1,4 @@ -import PageObject from 'overhaul/tests/page-object'; +import PageObject from 'wnyc-web-client/tests/page-object'; let { visitable, diff --git a/tests/unit/helpers/abbreviate-time-test.js b/tests/unit/helpers/abbreviate-time-test.js index 8b3788de3..cfd6c16ad 100644 --- a/tests/unit/helpers/abbreviate-time-test.js +++ b/tests/unit/helpers/abbreviate-time-test.js @@ -1,4 +1,4 @@ -import { abbreviateTime } from 'overhaul/helpers/abbreviate-time'; +import { abbreviateTime } from 'wnyc-web-client/helpers/abbreviate-time'; import { module, test } from 'qunit'; module('Unit | Helper | abbreviate time'); diff --git a/tests/unit/helpers/array-contains-test.js b/tests/unit/helpers/array-contains-test.js index bc2a99f99..5fe756aea 100644 --- a/tests/unit/helpers/array-contains-test.js +++ b/tests/unit/helpers/array-contains-test.js @@ -1,4 +1,4 @@ -import { arrayContains } from 'overhaul/helpers/array-contains'; +import { arrayContains } from 'wnyc-web-client/helpers/array-contains'; import { module, test } from 'qunit'; module('Unit | Helper | array contains'); diff --git a/tests/unit/helpers/camelize-keys-test.js b/tests/unit/helpers/camelize-keys-test.js index d83f2d5fd..3481f140a 100644 --- a/tests/unit/helpers/camelize-keys-test.js +++ b/tests/unit/helpers/camelize-keys-test.js @@ -1,4 +1,4 @@ -import { camelizeKeys } from 'overhaul/helpers/camelize-keys'; +import { camelizeKeys } from 'wnyc-web-client/helpers/camelize-keys'; import { module, test } from 'qunit'; module('Unit | Helper | camelize-keys'); diff --git a/tests/unit/helpers/can-change-volume-test.js b/tests/unit/helpers/can-change-volume-test.js index 5c540622a..e0946d5bc 100644 --- a/tests/unit/helpers/can-change-volume-test.js +++ b/tests/unit/helpers/can-change-volume-test.js @@ -1,4 +1,4 @@ -import { canChangeVolume } from 'overhaul/helpers/can-change-volume'; +import { canChangeVolume } from 'wnyc-web-client/helpers/can-change-volume'; import { module, test } from 'qunit'; module('Unit | Helper | can change volume'); diff --git a/tests/unit/helpers/humanize-duration-test.js b/tests/unit/helpers/humanize-duration-test.js index 0e8ed89e6..bd4503b70 100644 --- a/tests/unit/helpers/humanize-duration-test.js +++ b/tests/unit/helpers/humanize-duration-test.js @@ -1,4 +1,4 @@ -import { humanizeDuration } from 'overhaul/helpers/humanize-duration'; +import { humanizeDuration } from 'wnyc-web-client/helpers/humanize-duration'; import { module, test } from 'qunit'; module('Unit | Helper | humanize duration'); diff --git a/tests/unit/helpers/in-experimental-group-test.js b/tests/unit/helpers/in-experimental-group-test.js index d0d139fc3..909ac3a9e 100644 --- a/tests/unit/helpers/in-experimental-group-test.js +++ b/tests/unit/helpers/in-experimental-group-test.js @@ -1,6 +1,6 @@ -import { inExperimentalGroup } from 'overhaul/helpers/in-experimental-group'; +import { inExperimentalGroup } from 'wnyc-web-client/helpers/in-experimental-group'; import { module, test } from 'qunit'; -import { mockExperimentalGroup } from 'overhaul/tests/helpers/mock-experimental-group'; +import { mockExperimentalGroup } from 'wnyc-web-client/tests/helpers/mock-experimental-group'; module('Unit | Helper | in experimental group'); diff --git a/tests/unit/helpers/normalize-for-sorting-test.js b/tests/unit/helpers/normalize-for-sorting-test.js index 59edbee90..bb0d21dae 100644 --- a/tests/unit/helpers/normalize-for-sorting-test.js +++ b/tests/unit/helpers/normalize-for-sorting-test.js @@ -1,4 +1,4 @@ -import { normalizeForSorting } from 'overhaul/helpers/normalize-for-sorting'; +import { normalizeForSorting } from 'wnyc-web-client/helpers/normalize-for-sorting'; import { module, test } from 'qunit'; module('Unit | Helper | normalize for sorting'); diff --git a/tests/unit/helpers/numeric-duration-test.js b/tests/unit/helpers/numeric-duration-test.js index 1d9ea1525..f3a422536 100644 --- a/tests/unit/helpers/numeric-duration-test.js +++ b/tests/unit/helpers/numeric-duration-test.js @@ -1,4 +1,4 @@ -import { numericDuration } from 'overhaul/helpers/numeric-duration'; +import { numericDuration } from 'wnyc-web-client/helpers/numeric-duration'; import { module, test } from 'qunit'; module('Unit | Helper | numeric duration'); diff --git a/tests/unit/helpers/producing-orgs-test.js b/tests/unit/helpers/producing-orgs-test.js index 5af00e1b0..7d0bf2f6d 100644 --- a/tests/unit/helpers/producing-orgs-test.js +++ b/tests/unit/helpers/producing-orgs-test.js @@ -1,4 +1,4 @@ -import { producingOrgs } from 'overhaul/helpers/producing-orgs'; +import { producingOrgs } from 'wnyc-web-client/helpers/producing-orgs'; import { module, test } from 'qunit'; module('Unit | Helper | producing orgs'); diff --git a/tests/unit/helpers/share-metadata-test.js b/tests/unit/helpers/share-metadata-test.js index 78cc9cfd7..490eb008e 100644 --- a/tests/unit/helpers/share-metadata-test.js +++ b/tests/unit/helpers/share-metadata-test.js @@ -1,4 +1,4 @@ -import { shareMetadata } from 'overhaul/helpers/share-metadata'; +import { shareMetadata } from 'wnyc-web-client/helpers/share-metadata'; import { module, test } from 'qunit'; module('Unit | Helper | share metadata'); diff --git a/tests/unit/helpers/share-url-test.js b/tests/unit/helpers/share-url-test.js index 5c7177ea6..e2e894d13 100644 --- a/tests/unit/helpers/share-url-test.js +++ b/tests/unit/helpers/share-url-test.js @@ -1,4 +1,4 @@ -import { shareUrl } from 'overhaul/helpers/share-url'; +import { shareUrl } from 'wnyc-web-client/helpers/share-url'; import { module, test } from 'qunit'; module('Unit | Helper | share url'); diff --git a/tests/unit/helpers/song-metadata-test.js b/tests/unit/helpers/song-metadata-test.js index 2dc181ab8..5b99cd6fd 100644 --- a/tests/unit/helpers/song-metadata-test.js +++ b/tests/unit/helpers/song-metadata-test.js @@ -1,4 +1,4 @@ -import { songMetadata } from 'overhaul/helpers/song-metadata'; +import { songMetadata } from 'wnyc-web-client/helpers/song-metadata'; import { module, test } from 'qunit'; module('Unit | Helper | song metadata'); diff --git a/tests/unit/helpers/today-yesterday-or-date-test.js b/tests/unit/helpers/today-yesterday-or-date-test.js index 461032873..fd1695e7f 100644 --- a/tests/unit/helpers/today-yesterday-or-date-test.js +++ b/tests/unit/helpers/today-yesterday-or-date-test.js @@ -1,5 +1,5 @@ import moment from 'moment'; -import { todayYesterdayOrDate } from 'overhaul/helpers/today-yesterday-or-date'; +import { todayYesterdayOrDate } from 'wnyc-web-client/helpers/today-yesterday-or-date'; import { module, test } from 'qunit'; module('Unit | Helper | today yesterday or date'); diff --git a/tests/unit/instance-initializers/beta-trial-test.js b/tests/unit/instance-initializers/beta-trial-test.js index 3658f83f8..257a04902 100644 --- a/tests/unit/instance-initializers/beta-trial-test.js +++ b/tests/unit/instance-initializers/beta-trial-test.js @@ -1,10 +1,10 @@ import Ember from 'ember'; -import config from 'overhaul/config/environment'; -import { initialize } from 'overhaul/instance-initializers/beta-trial'; +import config from 'wnyc-web-client/config/environment'; +import { initialize } from 'wnyc-web-client/instance-initializers/beta-trial'; import { module, test } from 'qunit'; import destroyApp from '../../helpers/destroy-app'; -import { resetHTML } from 'overhaul/tests/helpers/html'; -import { plantBetaTrial } from 'overhaul/tests/helpers/beta'; +import { resetHTML } from 'wnyc-web-client/tests/helpers/html'; +import { plantBetaTrial } from 'wnyc-web-client/tests/helpers/beta'; module('Unit | Instance Initializer | beta trial | active trial', { beforeEach: function() { diff --git a/tests/unit/instance-initializers/google-experiments-test.js b/tests/unit/instance-initializers/google-experiments-test.js index 9d981b11e..8dde734e3 100644 --- a/tests/unit/instance-initializers/google-experiments-test.js +++ b/tests/unit/instance-initializers/google-experiments-test.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import { initialize } from 'overhaul/instance-initializers/google-experiments'; +import { initialize } from 'wnyc-web-client/instance-initializers/google-experiments'; import { module, test } from 'qunit'; import destroyApp from '../../helpers/destroy-app'; diff --git a/tests/unit/instance-initializers/link-handler-test.js b/tests/unit/instance-initializers/link-handler-test.js index 632236049..3daa8d5ef 100644 --- a/tests/unit/instance-initializers/link-handler-test.js +++ b/tests/unit/instance-initializers/link-handler-test.js @@ -1,7 +1,7 @@ import { module, test } from 'qunit'; -import { shouldHandleLink, normalizeHref } from 'overhaul/instance-initializers/link-handler'; -import ENV from 'overhaul/config/environment'; -import { canonicalize } from 'overhaul/services/script-loader'; +import { shouldHandleLink, normalizeHref } from 'wnyc-web-client/instance-initializers/link-handler'; +import ENV from 'wnyc-web-client/config/environment'; +import { canonicalize } from 'wnyc-web-client/services/script-loader'; let { wnycURL } = ENV; wnycURL = canonicalize(wnycURL); diff --git a/tests/unit/metrics-adapters/npr-analytics-test.js b/tests/unit/metrics-adapters/npr-analytics-test.js index b5ec7a447..fbedc144e 100644 --- a/tests/unit/metrics-adapters/npr-analytics-test.js +++ b/tests/unit/metrics-adapters/npr-analytics-test.js @@ -1,5 +1,5 @@ import { moduleFor, test } from 'ember-qunit'; -import config from 'overhaul/config/environment'; +import config from 'wnyc-web-client/config/environment'; moduleFor('metrics-adapter:npr-analytics', 'npr-analytics adapter', { // Specify the other units that are required for this test. diff --git a/tests/unit/mixins/beta-actions-test.js b/tests/unit/mixins/beta-actions-test.js index fa8336489..0d9cab64f 100644 --- a/tests/unit/mixins/beta-actions-test.js +++ b/tests/unit/mixins/beta-actions-test.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import BetaActionsMixin from 'overhaul/mixins/beta-actions'; +import BetaActionsMixin from 'wnyc-web-client/mixins/beta-actions'; import { module, test } from 'qunit'; module('Unit | Mixin | beta actions'); diff --git a/tests/unit/services/audio-test.js b/tests/unit/services/audio-test.js index b87e1e336..def9e6058 100644 --- a/tests/unit/services/audio-test.js +++ b/tests/unit/services/audio-test.js @@ -1,8 +1,8 @@ import Ember from 'ember'; import { moduleFor, test } from 'ember-qunit'; -import startMirage from 'overhaul/tests/helpers/setup-mirage-for-integration'; +import startMirage from 'wnyc-web-client/tests/helpers/setup-mirage-for-integration'; import wait from 'ember-test-helpers/wait'; -import hifiNeeds from 'overhaul/tests/helpers/hifi-needs'; +import hifiNeeds from 'wnyc-web-client/tests/helpers/hifi-needs'; import sinon from 'sinon'; import DummyConnection from 'ember-hifi/hifi-connections/dummy-connection'; diff --git a/tests/unit/services/bumper-state-test.js b/tests/unit/services/bumper-state-test.js index 68d4d9642..18333e399 100644 --- a/tests/unit/services/bumper-state-test.js +++ b/tests/unit/services/bumper-state-test.js @@ -1,11 +1,11 @@ import { moduleFor, test } from 'ember-qunit'; import Ember from 'ember'; -import startMirage from 'overhaul/tests/helpers/setup-mirage-for-integration'; +import startMirage from 'wnyc-web-client/tests/helpers/setup-mirage-for-integration'; import wait from 'ember-test-helpers/wait'; import get from 'ember-metal/get'; import set from 'ember-metal/set'; const { A, Service } = Ember; -import 'overhaul/tests/helpers/with-feature'; +import 'wnyc-web-client/tests/helpers/with-feature'; moduleFor('service:bumper-state', 'Unit | Service | bumper state', { // Specify the other units that are required for this test. diff --git a/tests/unit/services/listen-actions-test.js b/tests/unit/services/listen-actions-test.js index c90e940d4..e365720a8 100644 --- a/tests/unit/services/listen-actions-test.js +++ b/tests/unit/services/listen-actions-test.js @@ -1,7 +1,7 @@ import Ember from 'ember'; import { moduleFor, test } from 'ember-qunit'; -import startMirage from 'overhaul/tests/helpers/setup-mirage-for-integration'; -import ENV from 'overhaul/config/environment'; +import startMirage from 'wnyc-web-client/tests/helpers/setup-mirage-for-integration'; +import ENV from 'wnyc-web-client/config/environment'; // import wait from 'ember-test-helpers/wait'; let originalGetTime = Date.prototype.getTime; diff --git a/tests/unit/services/listen-queue-test.js b/tests/unit/services/listen-queue-test.js index 6f66c9031..b70f7d63a 100644 --- a/tests/unit/services/listen-queue-test.js +++ b/tests/unit/services/listen-queue-test.js @@ -1,6 +1,6 @@ import Ember from 'ember'; import { moduleFor, test } from 'ember-qunit'; -import startMirage from 'overhaul/tests/helpers/setup-mirage-for-integration'; +import startMirage from 'wnyc-web-client/tests/helpers/setup-mirage-for-integration'; import wait from 'ember-test-helpers/wait'; moduleFor('service:listen-queue', 'Unit | Service | listen queue', { diff --git a/tests/unit/services/metrics-test.js b/tests/unit/services/metrics-test.js index 8b25d8cbb..0a965814d 100644 --- a/tests/unit/services/metrics-test.js +++ b/tests/unit/services/metrics-test.js @@ -1,4 +1,4 @@ -import config from 'overhaul/config/environment'; +import config from 'wnyc-web-client/config/environment'; import { moduleFor } from 'ember-qunit'; import test from 'ember-sinon-qunit/test-support/test'; diff --git a/tests/unit/utils/animated-loading-icon-test.js b/tests/unit/utils/animated-loading-icon-test.js index 90b4e9632..783964bd4 100644 --- a/tests/unit/utils/animated-loading-icon-test.js +++ b/tests/unit/utils/animated-loading-icon-test.js @@ -1,4 +1,4 @@ -import loadingIcon from 'overhaul/utils/animated-loading-icon'; +import loadingIcon from 'wnyc-web-client/utils/animated-loading-icon'; import { module, test } from 'qunit'; module('Unit | Utility | animated loading icon');