Remove --debug-brk option

See #1376

Author: teobugslayer

docs/man_pages/project/testing/debug-android.md

@@ -3,9 +3,9 @@ debug android
 
 Usage | Synopsis
 ---|---
-Deploy on device, run the app and stop at the first breakpoint | `$ tns debug android --debug-brk [--device <Device ID>] [--debug-port <port>] [--timeout <timeout>]`
-Deploy in the native emulator, run the app and stop at the first breakpoint | `$ tns debug android --debug-brk --emulator [<Emulator Options>] [--timeout <timeout>]`
-Deploy in Genymotion, run the app and stop at the first breakpoint | `$ tns debug android --debug-brk --geny <Geny Name> [--timeout <timeout>]`
+Deploy on device, run the app and stop at the first breakpoint | `$ tns debug android [--device <Device ID>] [--debug-port <port>] [--timeout <timeout>]`
+Deploy in the native emulator, run the app and stop at the first breakpoint | `$ tns debug android --emulator [<Emulator Options>] [--timeout <timeout>]`
+Deploy in Genymotion, run the app and stop at the first breakpoint | `$ tns debug android --geny <Geny Name> [--timeout <timeout>]`
 Attach the debug tools to a running app on device | `$ tns debug android --start [--device <Device ID>] [--debug-port <port>] [--timeout <timeout>]`
 Attach the debug tools to a running app in the native emulator | `$ tns debug android --start --emulator [<Emulator Options>] [--timeout <timeout>]`
 Attach the debug tools to a running app in Genymotion | `$ tns debug android --start --geny <Geny Name> [--print-app-output] [--timeout <timeout>]`
@@ -18,19 +18,18 @@ Debugs your project on a connected device, in a native emulator or in Genymotion
 * `--device` - Specifies a connected device on which to debug the app.
 * `--emulator` - Specifies that you want to debug the app in the native Android emulator from the Android SDK.
 * `--geny` - Specifies a Genymotion emulator on which you want to debug your app.
-* `--debug-brk` - Prepares, builds and deploys the application package on a device or in an emulator, launches the Chrome DevTools of your Chrome browser. 
 * `--start` - Attaches the debug tools to a deployed and running app.
 * `--stop` - Detaches the debug tools.
 * `--get-port` - Retrieves the port on which you are debugging your application.
 * `--debug-port` - Sets a new port on which to attach the debug tools.
 * `--timeout` - Sets the number of seconds that the NativeScript CLI will wait for the debugger to boot. If not set, the default timeout is 90 seconds.
 
 ### Attributes
-* `<Device ID>` is the index or name of the target device as listed by `$ tns device` 
+* `<Device ID>` is the index or name of the target device as listed by `$ tns device`
 * `<Port>` is an accessible port on the device to which you want to attach the debugging tools.
 * `<Emulator Options>` is any valid combination of options as listed by `$ tns help emulate android`
 * `<GenyName>` is the name of the Genymotion virtual device that you want to use as listed by `$ genyshell -c "devices list"`
- 
+
 <% if(isHtml) { %>
 ###Prerequisites
 
@@ -56,6 +55,6 @@ Command | Description
 [run ios](run-ios.html) | Runs your project on a connected iOS device or in the iOS Simulator, if configured.
 [run](run.html) | Runs your project on a connected device or in the native emulator for the selected platform.
 [test init](test-init.html) | Configures your project for unit testing with a selected framework.
-[test android](test-android.html) | Runs the tests in your project on Android devices or native emulators. 
+[test android](test-android.html) | Runs the tests in your project on Android devices or native emulators.
 [test ios](test-ios.html) | Runs the tests in your project on iOS devices or the iOS Simulator.
 <% } %>

docs/man_pages/project/testing/debug-ios.md

@@ -3,20 +3,19 @@ debug ios
 
 Usage | Synopsis
 ---|---
-Deploy on device, run the app and stop at the first breakpoint | `$ tns debug ios --debug-brk [--device <Device ID>] [--no-client]`
-Deploy in the iOS Simulator, run the app and stop at the first breakpoint | `$ tns debug ios --debug-brk --emulator [<Emulator Options>] [--no-client]`
+Deploy on device, run the app and stop at the first breakpoint | `$ tns debug ios [--device <Device ID>] [--no-client]`
+Deploy in the iOS Simulator, run the app and stop at the first breakpoint | `$ tns debug ios --emulator [<Emulator Options>] [--no-client]`
 Attach the debug tools to a running app on device | `$ tns debug ios --start [--device <Device ID>] [--no-client]`
 Attach the debug tools to a running app in the iOS Simulator | `$ tns debug ios --start --emulator [<Emulator Options>] [--no-client]`
 
-Debugs your project on a connected device or in the iOS Simulator. <% if(isHtml) { %>Any debugging traffic is forwarded on port 8080 from the device to the local machine.<% } %> 
+Debugs your project on a connected device or in the iOS Simulator. <% if(isHtml) { %>Any debugging traffic is forwarded on port 8080 from the device to the local machine.<% } %>
 
-<% if(isConsole && (isWindows || isLinux)) { %>WARNING: You can run this command only on OS X systems. To view the complete help for this command, run `$ tns help debug ios`<% } %> 
+<% if(isConsole && (isWindows || isLinux)) { %>WARNING: You can run this command only on OS X systems. To view the complete help for this command, run `$ tns help debug ios`<% } %>
 
 <% if((isConsole && isMacOS) || isHtml) { %>
 <% if(isHtml) { %>> <% } %>IMPORTANT: Before building for iOS device, verify that you have configured a valid pair of certificate and provisioning profile on your OS X system. <% if(isHtml) { %>For more information, see [Obtaining Signing Identities and Downloading Provisioning Profiles](https://developer.apple.com/library/mac/recipes/xcode_help-accounts_preferences/articles/obtain_certificates_and_provisioning_profiles.html).<% } %>
 
 ### Options
-* `--debug-brk` - Prepares, builds and deploys the application package on a device or in an emulator, runs the app, launches the developer tools of your Safari browser and stops at the first breakpoint.
 * `--start` - Attaches the debug tools to a deployed and running app and launches the developer tools of your Safari browser.
 * `--emulator` - Indicates that you want to debug your app in the iOS simulator.
 * `--no-client` - If set, the NativeScript CLI attaches the debug tools but does not launch the developer tools in Safari.
@@ -25,8 +24,8 @@ Debugs your project on a connected device or in the iOS Simulator. <% if(isHtml)
 ### Attributes
 * `<Device ID>` is the index or name of the target device as listed by `$ tns device`
 * `<Emulator Options>` is any valid combination of options as listed by `$ tns help emulate ios`
-<% } %> 
-<% if(isHtml) { %> 
+<% } %>
+<% if(isHtml) { %>
 ### Prerequisite
 
 * If you want to debug in the iOS Simulator, you must have Xcode 6 or later installed on your system.
@@ -55,6 +54,6 @@ Command | Description
 [run ios](run-ios.html) | Runs your project on a connected iOS device or in the iOS Simulator, if configured.
 [run](run.html) | Runs your project on a connected device or in the native emulator for the selected platform.
 [test init](test-init.html) | Configures your project for unit testing with a selected framework.
-[test android](test-android.html) | Runs the tests in your project on Android devices or native emulators. 
+[test android](test-android.html) | Runs the tests in your project on Android devices or native emulators.
 [test ios](test-ios.html) | Runs the tests in your project on iOS devices or the iOS Simulator.
 <% } %>

docs/man_pages/project/testing/dev-test-android.md

@@ -3,15 +3,14 @@ test android
 
 Usage | Synopsis
 ------|-------
-Run tests on all connected devices | `$ tns test android [--watch] [--debug-brk]`
-Run tests on a selected device | `$ tns test android --device <Device ID> [--watch] [--debug-brk]`
+Run tests on all connected devices | `$ tns test android [--watch]`
+Run tests on a selected device | `$ tns test android --device <Device ID> [--watch]`
 
 Runs the tests in your project on connected Android devices and running native emulators.<% if(isConsole) { %> Your project must already be configured for unit testing by running `$ tns test init`.<% } %>
 
 ### Options
 * `--watch` - If set, when you save changes to the project, changes are automatically synchronized to the connected device and tests are re-run.
 * `--device` - Specifies the serial number or the index of the connected device on which to run the tests. To list all connected devices, grouped by platform, run `$ tns device`
-* `--debug-brk` - Runs the tests under the debugger. The debugger will break just before your tests are executed, so you have a chance to place breakpoints.
 
 ### Attributes
 * `<Device ID>` is the device index or identifier as listed by `$ tns device`

docs/man_pages/project/testing/test-android.md

@@ -3,15 +3,14 @@ test android
 
 Usage | Synopsis
 ------|-------
-Run tests on all connected devices | `$ tns test android [--watch] [--debug-brk]`
-Run tests on a selected device | `$ tns test android --device <Device ID> [--watch] [--debug-brk]`
+Run tests on all connected devices | `$ tns test android [--watch]`
+Run tests on a selected device | `$ tns test android --device <Device ID> [--watch]`
 
 Runs the tests in your project on connected Android devices and running native emulators.<% if(isConsole) { %> Your project must already be configured for unit testing by running `$ tns test init`.<% } %>
 
 ### Options
 * `--watch` - If set, when you save changes to the project, changes are automatically synchronized to the connected device and tests are re-run.
 * `--device` - Specifies the serial number or the index of the connected device on which to run the tests. To list all connected devices, grouped by platform, run `$ tns device`
-* `--debug-brk` - Runs the tests under the debugger. The debugger will break just before your tests are executed, so you have a chance to place breakpoints.
 
 ### Attributes
 * `<Device ID>` is the device index or identifier as listed by `$ tns device`

docs/man_pages/project/testing/test-ios.md

@@ -3,20 +3,19 @@ test ios
 
 Usage | Synopsis
 ------|-------
-Run tests on all connected devices | `$ tns test ios [--watch] [--debug-brk]`
-Run tests on a selected device | `$ tns test ios --device <Device ID> [--watch] [--debug-brk]`
-Run tests in the iOS Simulator | `$ tns test ios --emulator [--watch] [--debug-brk]`
+Run tests on all connected devices | `$ tns test ios [--watch]`
+Run tests on a selected device | `$ tns test ios --device <Device ID> [--watch]`
+Run tests in the iOS Simulator | `$ tns test ios --emulator [--watch]`
 
 Runs the tests in your project on connected iOS devices or the iOS Simulator.<% if(isConsole && isMacOS) { %> Your project must already be configured for unit testing by running `$ tns test init`.<% } %>
 
-<% if(isConsole && (isLinux || isWindows)) { %>WARNING: You can run this command only on OS X systems. To view the complete help for this command, run `$ tns help test ios`<% } %> 
+<% if(isConsole && (isLinux || isWindows)) { %>WARNING: You can run this command only on OS X systems. To view the complete help for this command, run `$ tns help test ios`<% } %>
 
 <% if((isConsole && isMacOS) || isHtml) { %>
 ### Options
 * `--watch` - If set, when you save changes to the project, changes are automatically synchronized to the connected device and tests are re-ran.
 * `--device` - Specifies the serial number or the index of the connected device on which you want to run tests. To list all connected devices, grouped by platform, run `$ tns device`. You cannot set `--device` and `--emulator` simultaneously.
 * `--emulator` - Runs tests on the iOS Simulator. You cannot set `--device` and `--emulator` simultaneously.
-* `--debug-brk` - Runs the tests under the debugger. The debugger will break just before your tests are executed, so you have a chance to place breakpoints.
 
 ### Attributes
 * `<Device ID>` is the device index or identifier as listed by `$ tns device`<% } %>

lib/services/android-debug-service.ts

@@ -94,12 +94,9 @@ class AndroidDebugService implements IDebugService {
 		return (() => {
 			let packageFile = "";
 
-			if(!this.$options.debugBrk && !this.$options.start && !this.$options.getPort && !this.$options.stop) {
-				this.$logger.warn("Neither --debug-brk nor --start option was specified. Defaulting to --debug-brk.");
-				this.$options.debugBrk = true;
-			}
+			let debugBrk = !this.$options.start && !this.$options.getPort && !this.$options.stop;
 
-			if (this.$options.debugBrk && !this.$options.emulator) {
+			if (debugBrk && !this.$options.emulator) {
 				let cachedDeviceOption = this.$options.forDevice;
 				this.$options.forDevice = true;
 				this.$platformService.buildPlatform(this.platform).wait();
@@ -127,7 +124,7 @@ class AndroidDebugService implements IDebugService {
 				this.attachDebugger(device.deviceInfo.identifier, packageName).wait();
 			} else if (this.$options.stop) {
 				this.detachDebugger(packageName).wait();
-			} else if (this.$options.debugBrk) {
+			} else {
 				this.startAppWithDebugger(packageFile, packageName).wait();
 			}
 		}).future<void>()();

lib/services/ios-debug-service.ts

@@ -37,26 +37,17 @@ class IOSDebugService implements IDebugService {
     }
 
     public debug(): IFuture<void> {
-        if (this.$options.debugBrk && this.$options.start) {
-            this.$errors.failWithoutHelp("Expected exactly one of the --debug-brk or --start options.");
-        }
-
-        if(!this.$options.debugBrk && !this.$options.start) {
-            this.$logger.warn("Neither --debug-brk nor --start option was specified. Defaulting to --debug-brk.");
-            this.$options.debugBrk = true;
-        }
-
         if (this.$options.emulator) {
-            if (this.$options.debugBrk) {
-                return this.emulatorDebugBrk();
-            } else if (this.$options.start) {
+            if (this.$options.start) {
                 return this.emulatorStart();
+            } else {
+                return this.emulatorDebugBrk();
             }
         } else {
-            if (this.$options.debugBrk) {
-                return this.deviceDebugBrk();
-            } else if (this.$options.start) {
+            if (this.$options.start) {
                 return this.deviceStart();
+            } else {
+                return this.deviceDebugBrk();
             }
         }
 

lib/services/test-execution-service.ts

@@ -37,6 +37,8 @@ class TestExecutionService implements ITestExecutionService {
 		private $errors: IErrors) {
 	}
 
+    private debugBrk: boolean;
+
 	public startTestRunner(platform: string) : IFuture<void> {
 		return (() => {
 			this.$options.justlaunch = true;
@@ -50,7 +52,7 @@ class TestExecutionService implements ITestExecutionService {
 						let projectFilesPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);
 
 						let configOptions: IKarmaConfigOptions = JSON.parse(launcherConfig);
-						this.$options.debugBrk = configOptions.debugBrk;
+						this.debugBrk = configOptions.debugBrk;
 						this.$options.debugTransport = configOptions.debugTransport;
 						let configJs = this.generateConfig(configOptions);
 						this.$fs.writeFile(path.join(projectDir, TestExecutionService.CONFIG_FILE_NAME), configJs).wait();
@@ -119,13 +121,13 @@ class TestExecutionService implements ITestExecutionService {
 							getApplicationPathForiOSSimulatorAction: getApplicationPathForiOSSimulatorAction,
 							localProjectRootPath: localProjectRootPath,
 							beforeBatchLiveSyncAction: beforeBatchLiveSyncAction,
-							shouldRestartApplication: (localToDevicePaths: Mobile.ILocalToDevicePathData[]) => Future.fromResult(!this.$options.debugBrk),
+							shouldRestartApplication: (localToDevicePaths: Mobile.ILocalToDevicePathData[]) => Future.fromResult(!this.debugBrk),
 							canExecuteFastLiveSync: (filePath: string) => false,
 						};
 
 						this.$usbLiveSyncServiceBase.sync(liveSyncData).wait();
 
-						if (this.$options.debugBrk) {
+						if (this.debugBrk) {
 							this.$logger.info('Starting debugger...');
 							let debugService: IDebugService = this.$injector.resolve(`${platform}DebugService`);
 							debugService.debugStart().wait();
@@ -163,7 +165,7 @@ class TestExecutionService implements ITestExecutionService {
 					node: process.execPath,
 					options: {
 						debugTransport: this.$options.debugTransport,
-						debugBrk: this.$options.debugBrk,
+						debugBrk: this.debugBrk,
 					}
 				},
 			};
@@ -173,7 +175,7 @@ class TestExecutionService implements ITestExecutionService {
 			if (!this.$options.watch) {
 				karmaConfig.singleRun = true;
 			}
-			if (this.$options.debugBrk) {
+			if (this.debugBrk) {
 				karmaConfig.browserNoActivityTimeout = 1000000000;
 			}
 			this.$logger.debug(JSON.stringify(karmaConfig, null, 4));