Update prepare tests.

Author: Vasil Chimev

tests/prepare_linux.py

@@ -43,15 +43,16 @@ def test_200_Prepare_Android_InsideProject(self):
         assert not FileExists('TNS_App/platforms/android/src/main/assets/app/tns_modules/application/application.android.js')
         assert not FileExists('TNS_App/platforms/android/src/main/assets/app/tns_modules/application/application.ios.js')
 
-    def test_201_Prepare_PlatformThatIsNotAdded(self):
-        CreateProject(projName="TNS_App")  
+    def test_201_Prepare_Android_PlatformNotAdded(self):
+        CreateProject(projName="TNS_App")
         output = runAUT(tnsPath + " prepare android --path TNS_App");
         assert("Copying template files..." in output)
         # Not valid for 1.3.0+
         # assert("Updated project.properties" in output)
         # assert("Updated local.properties" in output)
         assert("Project successfully created." in output)
         assert("Project successfully prepared" in output)
+        assert FileExists('TNS_App/platforms/android/src/main/assets/app/tns_modules/application/application.js')
 
     def test_300_Prepare_Android_RemoveOldFiles(self):
         CreateProjectAndAddPlatform(projName="TNS_App", platform="android", frameworkPath=androidRuntimePath)
@@ -102,9 +103,3 @@ def test_401_Prepare_InvalidPlatform(self):
         CreateProject(projName="TNS_App")  
         output = runAUT(tnsPath + " prepare windows --path TNS_App");
         assert("Invalid platform windows. Valid platforms are ios or android." in output)    
-
-    @unittest.skip("Moved to test_201_Prepare_PlatformThatIsNotAdded - this is no more a negative case due to https://github.com/NativeScript/nativescript-cli/issues/785")
-    def test_402_Prepare_PlatformThatIsNotAdded(self):
-        CreateProject(projName="TNS_App")  
-        output = runAUT(tnsPath + " prepare android --path TNS_App");
-        assert("The platform android is not added to this project. Please use 'tns platform add <platform>'" in output)    

tests/prepare_osx.py

@@ -1,8 +1,8 @@
 import unittest
 
 from helpers._os_lib import CleanupFolder, runAUT, FileExists
-from helpers._tns_lib import CreateProjectAndAddPlatform, iosRuntimeSymlinkPath, \
-    tnsPath
+from helpers._tns_lib import CreateProject, CreateProjectAndAddPlatform, \
+    iosRuntimeSymlinkPath, tnsPath
 
 
 class Prepare_OSX(unittest.TestCase):
@@ -48,7 +48,15 @@ def test_200_Prepare_Additional_AppResources_iOS(self):
         # Verify XCode Project include files from App Resources folder
         output = runAUT("cat TNS_App/platforms/ios/TNSApp.xcodeproj/project.pbxproj | grep newDefault.png")
         assert ("newDefault.png" in output)
-               
+
+    def test_201_Prepare_iOS_PlatformNotAdded(self):
+        CreateProject(projName="TNS_App")
+        output = runAUT(tnsPath + " prepare ios --path TNS_App");
+        assert("Copying template files..." in output)
+        assert("Project successfully created." in output)
+        assert("Project successfully prepared" in output)
+        assert FileExists('TNS_App/platforms/ios/TNSApp/app/tns_modules/application/application.js')
+
     def test_300_Prepare_iOS_PreserveCase(self):
         CreateProjectAndAddPlatform(projName="TNS_App", platform="ios", frameworkPath=iosRuntimeSymlinkPath, symlink=True)
         runAUT("cp TNS_App/node_modules/tns-core-modules/application/application-common.js TNS_App/node_modules/tns-core-modules/application/New-application-common.js")