From 616e51223016394bd35815cb9907699a2ea6874f Mon Sep 17 00:00:00 2001 From: albertopq Date: Tue, 1 Dec 2015 09:00:48 +0100 Subject: [PATCH 1/5] test commit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8d17907133a9..316eddf9bfda 100644 --- a/README.md +++ b/README.md @@ -169,3 +169,4 @@ You could generate single app doc with this: ```sh $ gulp jsdoc:system ``` + From f7830ea293245bc48e3926087a22b0319c4f7743 Mon Sep 17 00:00:00 2001 From: albertopq Date: Thu, 11 Feb 2016 11:10:03 +0100 Subject: [PATCH 2/5] Increasing timeout --- tv_apps/smart-system/test/marionette/lib/system.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv_apps/smart-system/test/marionette/lib/system.js b/tv_apps/smart-system/test/marionette/lib/system.js index 1747299f25fe..ea859138e5d5 100644 --- a/tv_apps/smart-system/test/marionette/lib/system.js +++ b/tv_apps/smart-system/test/marionette/lib/system.js @@ -54,7 +54,7 @@ System.prototype = { var body = this.client.findElement('body'); this.client.waitFor(function() { return body.getAttribute('ready-state') == 'fullyLoaded'; - }); + }, { timeout: 120000 }); }, waitForLaunch: function(url) { From 587c91f9a2c43642b0c12e748657a36e41736608 Mon Sep 17 00:00:00 2001 From: albertopq Date: Thu, 11 Feb 2016 11:10:57 +0100 Subject: [PATCH 3/5] QUick tests --- tests/taskcluster/tasks.yml | 26 +------------------ .../taskcluster/tasks/marionette_js_tests.yml | 1 + 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/tests/taskcluster/tasks.yml b/tests/taskcluster/tasks.yml index 0fbe96389764..7d0e4940aa4d 100644 --- a/tests/taskcluster/tasks.yml +++ b/tests/taskcluster/tasks.yml @@ -14,29 +14,5 @@ params: # All task definitions definitions: - build_unit: - - build_integration: - chunks: 8 - - gaia_ui_tests: - chunks: 30 - - csslint: - - jsonlint: - - jshint: - - eslint: - marionette_js_tests: - chunks: 40 - - marionette_js_tv_tests: - chunks: 10 - - unit_tests_b2g: - chunks: 30 - - jsmarionette_unit_tests: + chunks: 1 diff --git a/tests/taskcluster/tasks/marionette_js_tests.yml b/tests/taskcluster/tasks/marionette_js_tests.yml index 3915d930249e..9977e4882cb3 100644 --- a/tests/taskcluster/tasks/marionette_js_tests.yml +++ b/tests/taskcluster/tasks/marionette_js_tests.yml @@ -20,6 +20,7 @@ task: TEST_MANIFEST: '{{gaia}}/shared/test/integration/tbpl-manifest.json' NODE_MODULES_SRC: npm-cache HOST_LOG: artifacts/gecko_output.log + TEST_FILES: 'tv_apps/smart-system/test/marionette/app_modal_dialog_test.js' command: - entrypoint From 0dd799d69f59b3627eedd7b17fbd4922fc709212 Mon Sep 17 00:00:00 2001 From: albertopq Date: Thu, 11 Feb 2016 11:27:45 +0100 Subject: [PATCH 4/5] Revert "QUick tests" This reverts commit 587c91f9a2c43642b0c12e748657a36e41736608. --- tests/taskcluster/tasks.yml | 26 ++++++++++++++++++- .../taskcluster/tasks/marionette_js_tests.yml | 1 - 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/tests/taskcluster/tasks.yml b/tests/taskcluster/tasks.yml index 7d0e4940aa4d..0fbe96389764 100644 --- a/tests/taskcluster/tasks.yml +++ b/tests/taskcluster/tasks.yml @@ -14,5 +14,29 @@ params: # All task definitions definitions: + build_unit: + + build_integration: + chunks: 8 + + gaia_ui_tests: + chunks: 30 + + csslint: + + jsonlint: + + jshint: + + eslint: + marionette_js_tests: - chunks: 1 + chunks: 40 + + marionette_js_tv_tests: + chunks: 10 + + unit_tests_b2g: + chunks: 30 + + jsmarionette_unit_tests: diff --git a/tests/taskcluster/tasks/marionette_js_tests.yml b/tests/taskcluster/tasks/marionette_js_tests.yml index 9977e4882cb3..3915d930249e 100644 --- a/tests/taskcluster/tasks/marionette_js_tests.yml +++ b/tests/taskcluster/tasks/marionette_js_tests.yml @@ -20,7 +20,6 @@ task: TEST_MANIFEST: '{{gaia}}/shared/test/integration/tbpl-manifest.json' NODE_MODULES_SRC: npm-cache HOST_LOG: artifacts/gecko_output.log - TEST_FILES: 'tv_apps/smart-system/test/marionette/app_modal_dialog_test.js' command: - entrypoint From 04c0e133a9a22397d6a230971c9a5d3f05284387 Mon Sep 17 00:00:00 2001 From: albertopq Date: Thu, 11 Feb 2016 12:01:50 +0100 Subject: [PATCH 5/5] Using waitForLaunch --- .../smart-system/test/marionette/app_modal_dialog_test.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tv_apps/smart-system/test/marionette/app_modal_dialog_test.js b/tv_apps/smart-system/test/marionette/app_modal_dialog_test.js index 7eeaf7d60738..0cca06aa2607 100644 --- a/tv_apps/smart-system/test/marionette/app_modal_dialog_test.js +++ b/tv_apps/smart-system/test/marionette/app_modal_dialog_test.js @@ -54,12 +54,13 @@ marionette('Test Modal Dialog Events', function() { }; setup(function() { - system = client.loader.getAppClass('smart-system', 'system', 'tv_apps'); + system = client.loader.getAppClass('system'); + system.waitForStartup(); system.waitForFullyLoaded(); appModalDialog = new AppModalDialog(client); // Launch test app - client.apps.launch(APP_URL); - client.apps.switchToApp(APP_URL); + var frame = system.waitForLaunch(APP_URL); + client.switchToFrame(frame); }); test('alert modal dialog should disappear', testOptions, function() {