Skip to content

Commit 90372e0

Browse files
ferjmferjm
committed
Bug 1052227 - Move inapp pay test to packaged to avoid mochitest failures. r=kumar
1 parent 7c5fdf1 commit 90372e0

File tree

9 files changed

+37
-16
lines changed

9 files changed

+37
-16
lines changed

‎build/test/integration/helper.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ function checkWebappsScheme(webapps) {
5858
key + ' of webapps.json has not defined ' + configKey);
5959
});
6060
var scheme =
61-
webapp.origin.indexOf('mochi.test') !== -1 ||
62-
webapp.origin.indexOf('inapp-pay-test.paas.allizom.org') !== -1 ?
61+
webapp.origin.indexOf('mochi.test') !== -1 ?
6362
'http' : 'app';
6463
assert.equal(webapp.origin.indexOf(scheme), 0);
6564
});

‎customization/uuid.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"in_app_pay_test": "{0612b315-c258-8946-99ec-a8849ea367b0}",
32
"mochitest": "{ed6ee224-0ce0-e040-a9b6-e60036d8dd17}"
43
}

‎dev_apps/in_app_pay_test/img/out-128.png

22 KB
Loading

‎dev_apps/in_app_pay_test/img/out-256.png

68.7 KB
Loading

‎dev_apps/in_app_pay_test/img/out-64.png

6.75 KB
Loading

‎dev_apps/in_app_pay_test/index.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<html>
2+
<head>
3+
<title>In-App Payments Tester</title>
4+
<meta charset="utf-8"/>
5+
<link rel="stylesheet" type="text/css" href="style.css"/>
6+
</head>
7+
<body>
8+
<iframe id="app" src="http://inapp-pay-test.paas.allizom.org"></iframe>
9+
</body>
10+
</html>

‎dev_apps/in_app_pay_test/manifest.webapp

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
1-
{"name": "In-app Payment Tester",
2-
"description": "Utility app to test in-app payments.",
3-
"version": "1.0",
4-
"developer": {"name": "Kumar McMillan"},
5-
"launch_path": "/",
6-
"default_locale": "en",
7-
"installs_allowed_from": ["*"]}
1+
{
2+
"name": "In-app Payment Tester",
3+
"description": "Utility app to test in-app payments.",
4+
"version": "1.0",
5+
"launch_path": "/index.html",
6+
"developer": {
7+
"name": "The Gaia Team",
8+
"url": "https://github.com/mozilla-b2g/gaia"
9+
},
10+
"default_locale": "en",
11+
"icons": {
12+
"64": "/img/out-64.png",
13+
"128": "/img/out-128.png",
14+
"256": "/img/out-256.png"
15+
}
16+
}

‎dev_apps/in_app_pay_test/metadata.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎dev_apps/in_app_pay_test/style.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#app {
2+
position: fixed;
3+
border: 0;
4+
top: 0;
5+
left: 0;
6+
right: 0;
7+
bottom: 0;
8+
width: 100%;
9+
height: 100%;
10+
}

0 commit comments

Comments
 (0)