Rename editor's modules to be anonymous

assets/js/src/newsletter_editor/App.js

@@ -1,4 +1,4 @@
-define('newsletter_editor/App', [
+define([
     'backbone',
     'backbone.marionette',
     'backbone.supermodel',

assets/js/src/newsletter_editor/behaviors/BehaviorsLookup.js

@@ -4,7 +4,7 @@
  *
  * For more check: http://marionettejs.com/docs/marionette.behaviors.html#behaviorslookup
  */
-define('newsletter_editor/behaviors/behaviorsLookup', [
+define([
     'backbone.marionette',
   ], function(Marionette) {
 

assets/js/src/newsletter_editor/behaviors/ColorPickerBehavior.js

@@ -3,7 +3,7 @@
  *
  * Adds a color picker integration with the view
  */
-define('newsletter_editor/behaviors/ColorPickerBehavior', [
+define([
     'backbone.marionette',
     'newsletter_editor/behaviors/BehaviorsLookup',
     'spectrum',

assets/js/src/newsletter_editor/behaviors/ContainerDropZoneBehavior.js

@@ -5,7 +5,7 @@
  * Allows CollectionView instances that use this behavior to act as drop zones and
  * accept droppables
  */
-define('newsletter_editor/behaviors/ContainerDropZoneBehavior', [
+define([
     'backbone.marionette',
     'underscore',
     'newsletter_editor/behaviors/BehaviorsLookup',

assets/js/src/newsletter_editor/behaviors/DraggableBehavior.js

@@ -4,7 +4,7 @@
  * Allows View instances to be draggable.
  * Part of the drag&drop behavior.
  */
-define('newsletter_editor/behaviors/DraggableBehavior', [
+define([
     'backbone.marionette',
     'newsletter_editor/behaviors/BehaviorsLookup',
     'interact',

assets/js/src/newsletter_editor/behaviors/ResizableBehavior.js

@@ -3,7 +3,7 @@
  *
  * Allows resizing elements within a block
  */
-define('newsletter_editor/behaviors/ResizableBehavior', [
+define([
     'backbone.marionette',
     'newsletter_editor/behaviors/BehaviorsLookup',
     'interact',

assets/js/src/newsletter_editor/behaviors/SortableBehavior.js

@@ -3,7 +3,7 @@
  *
  * Allows sorting elements within a collection
  */
-define('newsletter_editor/behaviors/SortableBehavior', [
+define([
     'backbone.marionette',
     'newsletter_editor/behaviors/BehaviorsLookup',
   ], function(Marionette, BehaviorsLookup) {

assets/js/src/newsletter_editor/blocks/automatedLatestContent.js

@@ -6,7 +6,7 @@
  * This block depends on blocks.button and blocks.divider for block model and
  * block settings view.
  */
-define('newsletter_editor/blocks/automatedLatestContent', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/blocks/base.js

@@ -4,7 +4,7 @@
  * a BlockModel and a BlockView.
  * BlockToolsView, BlockSettingsView and BlockWidgetView are optional.
  */
-define('newsletter_editor/blocks/base', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/blocks/button.js

@@ -1,7 +1,7 @@
 /**
  * Button content block
  */
-define('newsletter_editor/blocks/button', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/blocks/container.js

@@ -3,7 +3,7 @@
  * This is a special kind of block, as it can contain content blocks, as well
  * as other containers.
  */
-define('newsletter_editor/blocks/container', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/blocks/divider.js

@@ -1,7 +1,7 @@
 /**
  * Divider content block
  */
-define('newsletter_editor/blocks/divider', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/blocks/footer.js

@@ -1,7 +1,7 @@
 /**
  * Footer content block
  */
-define('newsletter_editor/blocks/footer', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/blocks/header.js

@@ -1,7 +1,7 @@
 /**
  * Header content block
  */
-define('newsletter_editor/blocks/header', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/blocks/image.js

@@ -1,7 +1,7 @@
 /**
  * Image content block
  */
-define('newsletter_editor/blocks/image', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/blocks/posts.js

@@ -10,7 +10,7 @@
  * This block depends on blocks.button and blocks.divider for block model and
  * block settings view.
  */
-define('newsletter_editor/blocks/posts', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/blocks/social.js

@@ -1,7 +1,7 @@
 /**
  * Social icons content block
  */
-define('newsletter_editor/blocks/social', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/blocks/spacer.js

@@ -1,7 +1,7 @@
 /**
  * Spacer content block
  */
-define('newsletter_editor/blocks/spacer', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/blocks/text.js

@@ -1,7 +1,7 @@
 /**
  * Text content block
  */
-define('newsletter_editor/blocks/text', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/components/config.js

@@ -1,4 +1,4 @@
-define('newsletter_editor/components/config', [
+define([
     'newsletter_editor/App',
     'backbone',
   ], function(EditorApplication, Backbone) {

assets/js/src/newsletter_editor/components/content.js

@@ -1,4 +1,4 @@
-define('newsletter_editor/components/content', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/components/heading.js

@@ -1,4 +1,4 @@
-define('newsletter_editor/components/heading', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/components/save.js

@@ -1,4 +1,4 @@
-define('newsletter_editor/components/save', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/components/sidebar.js

@@ -1,4 +1,4 @@
-define('newsletter_editor/components/sidebar', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/components/styles.js

@@ -1,4 +1,4 @@
-define('newsletter_editor/components/styles', [
+define([
     'newsletter_editor/App',
     'backbone',
     'backbone.marionette',

assets/js/src/newsletter_editor/components/wordpress.js

@@ -1,14 +1,9 @@
-define('newsletter_editor/components/wordpress', [
+define([
     'newsletter_editor/App',
-    'backbone',
+    'mailpoet'
-    'backbone.marionette',
+  ], function(EditorApplication, MailPoet) {
-    'mailpoet',
-    'ajax'
-  ], function(EditorApplication, Backbone, Marionette, MailPoet) {
-
-  EditorApplication.module("components.wordpress", function(Module, App, Backbone, Marionette, $, _) {
-    "use strict";
 
+  var Module = {};
   var postTypesCache,
       taxonomiesCache = [],
       termsCache = [];
@@ -54,9 +49,10 @@ define('newsletter_editor/components/wordpress', [
     return termsCache[key];
   };
 
-    App.on('start', function(options) {
+  EditorApplication.on('start', function(options) {
     // Prefetch post types
     Module.getPostTypes();
   });
-  });
+
+  return Module;
 });

package.json

@@ -38,7 +38,7 @@
     "export-loader": "webpack/exports-loader.git",
     "import-loader": "webpack/imports-loader.git",
     "expose-loader": "webpack/expose-loader.git",
-    "rewire": "webpack/rewire.git",
+    "amd-inject-loader": "latest",
     "chai": "2.2.0",
     "chai-jq": "0.0.8",
     "grunt": "^0.4.5",

tests/javascript/newsletter_editor/blocks/automatedLatestContent.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/blocks/automatedLatestContent', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/blocks/automatedLatestContent'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/blocks/button.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/blocks/button', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/blocks/button'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/blocks/container.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/blocks/container', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/blocks/container'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/blocks/divider.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/blocks/divider', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/blocks/divider'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/blocks/footer.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/blocks/footer', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/blocks/footer'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/blocks/header.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/blocks/header', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/blocks/header'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/blocks/image.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/blocks/image', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/blocks/image'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/blocks/posts.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/blocks/posts', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/blocks/posts'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/blocks/social.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/blocks/social', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/blocks/social'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/blocks/spacer.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/blocks/spacer', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/blocks/spacer'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/blocks/text.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/blocks/text', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/blocks/text'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/components/config.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/components/config', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/components/config'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/components/content.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/components/content', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/components/content'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/components/heading.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/components/heading', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/components/heading'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/components/save.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/components/save', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/components/save'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/components/sidebar.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/components/sidebar', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/components/sidebar'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/components/styles.spec.js

@@ -1,4 +1,4 @@
-define('test/newsletter_editor/components/config', [
+define([
     'newsletter_editor/App',
     'newsletter_editor/components/config'
   ], function(EditorApplication) {

tests/javascript/newsletter_editor/components/wordpress.spec.js

@@ -0,0 +1,28 @@
+define([
+    'newsletter_editor/App',
+    'newsletter_editor/components/wordpress'
+  ], function(EditorApplication, Wordpress) {
+
+  describe('getPostTypes', function() {
+    it('fetches post types from the server', function() {
+      var injector = require('amd-inject-loader!newsletter_editor/components/wordpress');
+      var module = injector({
+        "mailpoet": {
+          Ajax: {
+            post: function() {
+              var deferred = jQuery.Deferred();
+              deferred.resolve({
+                'post': 'val1',
+                'page': 'val2',
+              });
+              return deferred;
+            }
+          },
+        },
+      });
+      module.getPostTypes().done(function(types) {
+        expect(types).to.include.members(['val1', 'val2']);
+      });
+    });
+  });
+});

tests/javascript/newsletter_editor/testAjax.js

@@ -1,4 +1,4 @@
-define('testAjax', [ 'mailpoet', 'ajax'], function(MailPoet) {
+define(['mailpoet', 'ajax'], function(MailPoet) {
   describe('Ajax submodule', function() {
     it('has a version', function() {
       expect(MailPoet.Ajax.version).to.be.a('number');