From 31ec1944541588cfb80d350e481a2f295d725f27 Mon Sep 17 00:00:00 2001 From: Miroslava Ivanova Date: Mon, 3 Dec 2018 17:10:21 +0200 Subject: [PATCH 1/2] add asserts for analytics check --- tests/build/common/usage_reporting_tests.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/build/common/usage_reporting_tests.py b/tests/build/common/usage_reporting_tests.py index 8ce88d7e..9498ae52 100644 --- a/tests/build/common/usage_reporting_tests.py +++ b/tests/build/common/usage_reporting_tests.py @@ -4,6 +4,8 @@ import os from core.base_class.BaseClass import BaseClass +from core.osutils.file import File +from core.settings.settings import TEST_RUN_HOME from core.settings.strings import * from core.tns.tns import Tns @@ -21,6 +23,9 @@ def tearDownClass(cls): def test_001_usage_reporting_enable(self): output = Tns.run_tns_command("usage-reporting enable") assert enabled.format(usage_reporting, "now ") in output + config = os.path.join(TEST_RUN_HOME, 'node_modules', 'nativescript', 'config', 'config.json') + assert "GA_TRACKING_ID" in File.read(config) + assert "UA-111455-44" in File.read(config) # Check there is message for tracking in Google Analytics output = Tns.run_tns_command("doctor", timeout=180, log_trace=True) @@ -40,6 +45,9 @@ def test_001_usage_reporting_enable(self): def test_002_usage_reporting_disable(self): output = Tns.run_tns_command("usage-reporting disable") assert disabled.format(usage_reporting, "now ") in output + config = os.path.join(TEST_RUN_HOME, 'node_modules', 'nativescript', 'config', 'config.json') + assert "GA_TRACKING_ID" in File.read(config) + assert "UA-111455-44" in File.read(config) # Check there is no any message for tracking in Google Analytics output = Tns.run_tns_command("doctor", timeout=180, log_trace=True) From 51c74adfbda2f4ddda7afdaf3d073287afa882f3 Mon Sep 17 00:00:00 2001 From: Miroslava Ivanova Date: Tue, 4 Dec 2018 11:20:46 +0200 Subject: [PATCH 2/2] fix --- tests/build/common/usage_reporting_tests.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/build/common/usage_reporting_tests.py b/tests/build/common/usage_reporting_tests.py index 9498ae52..7161d595 100644 --- a/tests/build/common/usage_reporting_tests.py +++ b/tests/build/common/usage_reporting_tests.py @@ -11,6 +11,7 @@ class UsageReportingTests(BaseClass): + config = os.path.join(TEST_RUN_HOME, 'node_modules', 'nativescript', 'config', 'config.json') @classmethod def setUpClass(cls): @@ -23,9 +24,8 @@ def tearDownClass(cls): def test_001_usage_reporting_enable(self): output = Tns.run_tns_command("usage-reporting enable") assert enabled.format(usage_reporting, "now ") in output - config = os.path.join(TEST_RUN_HOME, 'node_modules', 'nativescript', 'config', 'config.json') - assert "GA_TRACKING_ID" in File.read(config) - assert "UA-111455-44" in File.read(config) + assert "GA_TRACKING_ID" in File.read(self.config) + assert "UA-111455-44" in File.read(self.config) # Check there is message for tracking in Google Analytics output = Tns.run_tns_command("doctor", timeout=180, log_trace=True) @@ -45,9 +45,8 @@ def test_001_usage_reporting_enable(self): def test_002_usage_reporting_disable(self): output = Tns.run_tns_command("usage-reporting disable") assert disabled.format(usage_reporting, "now ") in output - config = os.path.join(TEST_RUN_HOME, 'node_modules', 'nativescript', 'config', 'config.json') - assert "GA_TRACKING_ID" in File.read(config) - assert "UA-111455-44" in File.read(config) + assert "GA_TRACKING_ID" in File.read(self.config) + assert "UA-111455-44" in File.read(self.config) # Check there is no any message for tracking in Google Analytics output = Tns.run_tns_command("doctor", timeout=180, log_trace=True)