Skip to content
Permalink
Browse files

Revert "Bug 1158238 - Follow-up, rename activity and add enable devel…

…oper mode in test to not break when gecko patch lands r=kgrandon"

This reverts commit 111575e.
  • Loading branch information
KevinGrandon committed Apr 29, 2015
1 parent d032a21 commit 320bdae4d4d3e0a84230d04086fe40736b69ec5b
Showing with 10 additions and 13 deletions.
  1. +5 −6 apps/system/js/import.js
  2. +2 −1 apps/system/manifest.webapp
  3. +3 −6 apps/system/test/marionette/import_app_test.js
@@ -2,13 +2,12 @@

(function(exports) {

/**
* Handles importing of blobs into the system app.
* Currently supports the 'import-app' activity, which
* installs a blob on the device if developer mode is enabled.
*/
function Import() {}

/**
* Opens a new private window.
* @param {String} url The url to navigate to
*/
Import.prototype = {

/**
@@ -25,7 +24,7 @@
handleActivity: function(activity) {
var name = activity.source.name;
switch (name) {
case 'import-app':
case 'import':
this.importApp(activity);
break;
}
@@ -76,8 +76,9 @@
"284": "/style/icons/system_284.png"
},
"activities": {
"import-app": {
"import": {
"filters": {
"type": "app",
"blob": {
"required": true
}
@@ -6,11 +6,7 @@ var Server = require('../../../../shared/test/integration/server');

marionette('Import App', function() {

var client = marionette.client({
prefs: {
'dom.apps.developer_mode': true
}
});
var client = marionette.client();

var home, server, system;

@@ -64,8 +60,9 @@ marionette('Import App', function() {
// Send a moz activity to the system app with the blob.
function sendActivity(blob) {
var activity = new MozActivity({
name: 'import-app',
name: 'import',
data: {
type: 'app',
blob: blob
}
});

0 comments on commit 320bdae

Please sign in to comment.
You can’t perform that action at this time.