From 80f5820b8fa749335e669908fa6cf48e17d64dc0 Mon Sep 17 00:00:00 2001
From: Timothy Guan-tin Chien <timdream@gmail.com>
Date: Fri, 7 Feb 2014 17:25:00 +0800
Subject: [PATCH] Bug 968703 - Migrate code snippet for wapppush customization
 from applications-data.js to apps/wappush/build/build.js

---
 apps/wappush/.gitignore                        |  2 +-
 apps/wappush/Makefile                          |  6 ++++++
 apps/wappush/build/build.js                    | 18 ++++++++++++++++++
 build/applications-data.js                     |  7 -------
 build/test/integration/distribution.test.js    | 13 +++++++++++++
 .../distribution_test/wappush-whitelist.json   |  1 +
 6 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 apps/wappush/Makefile
 create mode 100644 apps/wappush/build/build.js
 create mode 100644 build/test/resources/distribution_test/wappush-whitelist.json

diff --git a/apps/wappush/.gitignore b/apps/wappush/.gitignore
index d1d13c7d5b9d..410232a3ea0d 100644
--- a/apps/wappush/.gitignore
+++ b/apps/wappush/.gitignore
@@ -1 +1 @@
-js/whitelist.json
+/js/whitelist.json
diff --git a/apps/wappush/Makefile b/apps/wappush/Makefile
new file mode 100644
index 000000000000..567f0747790b
--- /dev/null
+++ b/apps/wappush/Makefile
@@ -0,0 +1,6 @@
+-include $(PWD)/build/common.mk
+
+.PHONY: build
+build:
+	@echo 'Building wappush app...'
+	@$(call run-app-js-command, build)
diff --git a/apps/wappush/build/build.js b/apps/wappush/build/build.js
new file mode 100644
index 000000000000..aeec7464d266
--- /dev/null
+++ b/apps/wappush/build/build.js
@@ -0,0 +1,18 @@
+'use strict';
+
+/* global require, exports */
+
+var utils = require('utils');
+
+function execute(config) {
+  var distDir = config.GAIA_DISTRIBUTION_DIR;
+
+  var file = utils.getFile(config.GAIA_DIR,
+                           'apps', 'wappush', 'js', 'whitelist.json');
+  var defaultContent = [];
+  var content = utils.getDistributionFileContent('wappush-whitelist',
+                                                  defaultContent, distDir);
+  utils.writeContent(file, content);
+}
+
+exports.execute = execute;
diff --git a/build/applications-data.js b/build/applications-data.js
index 8a5395d4ba45..3d6d41657a8d 100644
--- a/build/applications-data.js
+++ b/build/applications-data.js
@@ -405,13 +405,6 @@ function execute(options) {
   utils.writeContent(init,
     utils.getDistributionFileContent('wapuaprof.json', content, distDir));
 
-  // WAP Push
-  init = utils.getFile(config.GAIA_DIR, 'apps', 'wappush', 'js', 'whitelist.json');
-  content = [];
-
-  utils.writeContent(init,
-    utils.getDistributionFileContent('wappush-whitelist', content));
-
   // Communications config
   init = utils.getFile(config.GAIA_DIR,
     'apps', 'communications', 'contacts', 'config.json');
diff --git a/build/test/integration/distribution.test.js b/build/test/integration/distribution.test.js
index 021f03f3537c..d961c5b113e9 100644
--- a/build/test/integration/distribution.test.js
+++ b/build/test/integration/distribution.test.js
@@ -35,6 +35,18 @@ suite('Distribution mechanism', function() {
       'Local', 'Property providerType should equal "Local"')
   }
 
+  function validateWappush() {
+    var wappushZip = new AdmZip(path.join(process.cwd(), 'profile',
+      'webapps', 'wappush.gaiamobile.org', 'application.zip'));
+    var whitelist =
+      wappushZip.readAsText(wappushZip.getEntry('js/whitelist.json'));
+    assert.isNotNull(whitelist, 'js/whitelist.json should exist');
+    var list = JSON.parse(whitelist);
+    assert.isDefined(list[0], 'whitelist[0] should be defined');
+    assert.equal(list[0], '9871010079',
+      'whitelist[0] should equal "9871010079"');
+  }
+
   test('build with GAIA_DISTRIBUTION_DIR', function(done) {
     var distDir = path.join(process.cwd(), 'build', 'test', 'resources',
       'distribution_test');
@@ -43,6 +55,7 @@ suite('Distribution mechanism', function() {
       helper.checkError(error, stdout, stderr);
       validateSettings();
       validateCalendar();
+      validateWappush();
       done();
     });
   });
diff --git a/build/test/resources/distribution_test/wappush-whitelist.json b/build/test/resources/distribution_test/wappush-whitelist.json
new file mode 100644
index 000000000000..b57b35491698
--- /dev/null
+++ b/build/test/resources/distribution_test/wappush-whitelist.json
@@ -0,0 +1 @@
+["9871010079"]