xcfit 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a6bc50869cd1436a9cc712aff3b0234a8a8bfd3
-  data.tar.gz: 729394f9e92ecde9f846910c9ff3661a57feeeb9
+  metadata.gz: dc00680c334473032feb71cdbc14b2749c3da605
+  data.tar.gz: d1ab5d98d96d66e6d714916ccc780ab7bd43205b
 SHA512:
-  metadata.gz: ad23c796e3fd0b06cc4721c63ced0e3bb9a3458d16cde23e2a0b3e4da19f0fc0766b94dea845c321dd53c9ef464c7cc1fc4e41d8f595b0564a12b26a56dee01f
-  data.tar.gz: e205e6da57c70d4347b98a534ef5aa564a9aeef8204a4cec7f1af3e2696a141cbff0a3a9b3d115d113a09578f21125d77a78131c4de433462250ca422d9f2d49
+  metadata.gz: 51d8eab780e0957315857f5991bef39173d0e3e4c543cdad9118dd1fa49605b4a87aa1b21aab7f6134a09bbc65b83bcc243caf5766ddb41efbc5f0576421ec2d
+  data.tar.gz: 48e04d9dc47e75ec9d2ba339f56d39fa019ac0e23435667e73e095fd407f1a5ebd9848d6efeb2eb44573a95635f5f1388888ff2fa73a6fd7fb1debc7f7b02339

data/.swift-version

@@ -0,0 +1 @@
+3.1-dev

data/.travis.yml

@@ -2,16 +2,16 @@
 # * http://www.objc.io/issue-6/travis-ci.html
 # * https://github.com/supermarin/xcpretty#usage
 
-osx_image: xcode7.3
-language: objective-c
-# cache: cocoapods
-podfile: XCFit2Demo/Podfile
-gemfile: XCFit2Demo/Gemfile
-
-script:
- - cd XCFit2Demo
- - pwd
- - set -o pipefail && xcodebuild -list
- - bundle install
- - echo "==========Now Running XCUI Cucumberish Tests==================="
- - bundle exec fastlane xcfit_ui_test
+os:
+  - osx
+language: generic
+sudo: required
+dist: trusty
+osx_image: xcode8
+# script:
+#   - swift build
+#   - swift test
+# notifications:
+#   email:
+#     on_success: never
+#     on_failure: change

data/README.md

@@ -5,9 +5,9 @@
 
 # XCFit : Full Stack BDD in Xcode
 
-**XCFit a.k.a ([XCUI](https://developer.apple.com/videos/play/wwdc2015/406/0), [Cucumberish](https://github.com/Ahmed-Ali/Cucumberish) and [Fitnesse](https://github.com/paulstringer/OCSlimProject) Integrations Tests) is a full stack Xcode BDD framework for [Swift](https://swift.org) iOS and macOS apps. XCFit allows us to write API level, UI and Acceptance Tests with Swift in human readable language using tools like [Cucumber](https://cucumber.io/) and [Fitnesse](http://fitnesse.org/) in Xcode. We can still use Apple's brand new UI Testing framework (XCUI) under the hood of Cucumberish. XCFit is fully automated solution for Cucumberish and Fitnesse. You can use 80(Fitnesse):20(Cucumberish) formula to automate Acceptance and UI Testing for better coverage and faster feedback. XCFit is available on [RubyGem](https://rubygems.org/gems/xcfit),  [CocoaPods](http://cocoadocs.org/docsets/XCFit) and Swift Package Manager.**
+**XCFit a.k.a ([XCUI](https://developer.apple.com/videos/play/wwdc2015/406/0), [Cucumberish](https://github.com/Ahmed-Ali/Cucumberish) and [Fitnesse](https://github.com/paulstringer/OCSlimProject) Integrations Tests) is a full stack Xcode BDD framework for [Swift](https://swift.org) iOS and macOS apps. XCFit allows us to write API level, UI and Acceptance Tests with Swift in human readable language using tools like [Cucumber](https://cucumber.io/) and [Fitnesse](http://fitnesse.org/) in Xcode. We can still use Apple's brand new UI Testing framework (XCUI) under the hood of Cucumberish. XCFit is fully automated solution for Cucumberish and Fitnesse. You can use 80(Fitnesse):20(Cucumberish) formula to automate Acceptance and UI Testing for better coverage and faster feedback. XCFit is available on [Homebrew](http://brew.sh), [RubyGem](https://rubygems.org/gems/xcfit),  [CocoaPods](http://cocoadocs.org/docsets/XCFit) and Swift Package Manager.**
 
-### XCFit 2.0 has just released ! 
+### XCFit 2.0 has just released !
 
 ![image](https://github.com/Shashikant86/XCFit-GIFS/blob/master/XCFit2Release.png)
 
@@ -52,10 +52,13 @@
 
 * **CocoaPods** -- [XCFit-CocoaPods](http://cocoadocs.org/docsets/XCFit) : BDD Style scenarios for iOS App
 
+* **Homebrew** - Just do `brew tap shashikant86/homebrew-taps` and `brew install xcfit`
+
 * **RubyGems**  -- [xcfit-RubyGem](https://rubygems.org/gems/xcfit) : Automated Xcode Templates
 
 * **Swift Package Manager** : 2.0.0 : XCUI Test Framework Helpers
 
+
 # Tech & Software Requirements
 
 XCFit uses a number of open source projects to work properly. You need to have following
@@ -74,6 +77,7 @@ You must have Mac Operating System with OSX/MacOS version > 10.9
    - RubyGem with [Cocoapods](https://cocoapods.org/) installed
 * **[Curl on Mac](https://developer.apple.com/legacy/library/documentation/Darwin/Reference/ManPages/man1/curl.1.html)**
    - Might be pre-installed but worth double checking.
+* **[Homebrew](http://brew.sh)**   
 * **[iOS-Sim](https://www.npmjs.com/package/ios-sim)**
   - Node Package required to launch iOS app for Fitnesse Acceptance tests.
 * [**Java**](https://www.java.com/en/)
@@ -85,23 +89,45 @@ You must have Mac Operating System with OSX/MacOS version > 10.9
 
 # Installation
 
+XCFit can be installed using [Homebrew](http://brew.sh) or using [RubyGems](https://rubygems.org/) but it's strongly recommended to install it using Homebrew.
+
+## Install with HomeBrew
+
+Assuming you have already installed [Homebrew](http://brew.sh). Let's tap the formula
+
+     brew tap shashikant86/homebrew-taps
+Now, we can install XCFit brew package using
+
+     brew install xcfit
+
+
+This is recommended method to install `XCFit` over the Rubygem mentioned below.
+
 ## Install XCFit Gem
-In order to get started, We need to install XCFit from [RubyGems](https://rubygems.org/). This will set our Xcode for BDD
+If you can't use HomeBrew for some reason then XCFit can be installed using [RubyGems](https://rubygems.org/). This will set our Xcode for BDD
 
        $ gem install xcfit
 
 You need to use with 'sudo' if you are using system (pre-installed) Ruby(2.0). XCFit gem will be used to set all the Xcode Templated for Xcode 8 as well Xcode 7
 
-Now that you can execute 'xcfit' command from your terminal/iTerm etc etc. Example Output Looks like this :
+# XCFit Commands
+
+Once you installed XCFit with HomeBrew/Rubygem then you can execute 'xcfit' command from your terminal/iTerm etc etc. Example Output Looks like this :
 
 ```
 $xcfit                                                                  
-Tasks:
-  xcfit get_cucumberish VERSION  
-  xcfit get_fitnesse             
-  xcfit help [TASK]             
-  xcfit set_xcode7_templates     
-  xcfit set_xcode_templates      
+setup_xcode_templates:
+    generate a Xcode 8 Templates for the Cucumberish and Fitnesse
+  setup_xcode7_templates:
+      generate a Xcode 7.x Templates. Please upgrade to Xcode 8
+  setup_gherkin:
+    generate Xcode Templates for the Gherkin Feature Files
+  get_cucumberish:
+      Downloads Cucumberish version
+  version:
+    prints the XCFit version
+  help:
+    prints more detailed help information.
 ```
 
 
@@ -123,15 +149,6 @@ $ xcfit set_xcode_templates
 
 ```
 
-##### Xcode 7
-
-To setup Templates for Xcode 7.x.
-
-
-```sh
-$ xcfit set_xcode7_templates
-
-```
 
 -  This will add couple of templates to your Xcode for iOS and macOS apps. In your app if you go to 'File--->New--->Target'
 
@@ -203,13 +220,13 @@ Here is how to do it.
 
 * **Cucumberish Header Files**
 
-We still don't have content of [Cucumberish](https://github.com/Ahmed-Ali/Cucumberish/tree/master/Cucumberish) to be included in our project. 
+We still don't have content of [Cucumberish](https://github.com/Ahmed-Ali/Cucumberish/tree/master/Cucumberish) to be included in our project.
 
-### Getting Cucumberish into our Target 
+### Getting Cucumberish into our Target
 
-In order to get [Cucumberish](https://github.com/Ahmed-Ali/Cucumberish/tree/master/Cucumberish) source content. There are few ways we can do that 
+In order to get [Cucumberish](https://github.com/Ahmed-Ali/Cucumberish/tree/master/Cucumberish) source content. There are few ways we can do that
 
-- ***Adding XCFit CocoaPod to Project***
+- **Cocoapods**
 
 Create a 'Podfile' if you don't have already. In your Podfile, add following Pod entry and update/install pod
 
@@ -230,30 +247,35 @@ $ pod install
 
 Now close the existing Xcode session and Xcode Workspace next time.
 
-> **Note** There is issue with Cocoapods when you have ``'use_frameworks!'``, it will not import header files and build will fail. If you are not using Frameworks in th Podfile then this approach is OK. 
+> **Note** There is issue with Cocoapods when you have ``'use_frameworks!'``, it will not import header files and build will fail. If you are not using Frameworks in th Podfile then this approach is OK.
 
-- ***Manually Copy Content of Cucumberish and Drag to Xcode - Prefered Way***
+- **Manual Installtion**
 
-We can manually copy content of [Cucumberish](https://github.com/Ahmed-Ali/Cucumberish/tree/master/Cucumberish) directory and drag to target as with option "**Create groups" and "Copy items if needed**". 
+We can manually copy content of [Cucumberish](https://github.com/Ahmed-Ali/Cucumberish/tree/master/Cucumberish) directory and drag to target as with option "**Create groups" and "Copy items if needed**".
 
-Here is How to setup everything in a minute 
+Here is How to setup everything in a minute
 
 ![image](https://github.com/Shashikant86/XCFit-GIFS/blob/master/XCFitStartUp.gif)
 
-- ***Use Carthage without build and drag the folder to target*** 
+- **Carthage**
 
-Create a `Cartfile ` with following Content 
+Create a `Cartfile ` with following Content
 
 ```
          github "Ahmed-Ali/Cucumberish"
 ```
-Now run Carthage wihtout build option. 
-    
-          $ carthage update --platform iOS --no-build 
-          
-Now in the `Carthage/Checkout` directory has Cucumberish. Just add that to target or workspace. 
+Now run Carthage wihtout build option.
+
+          $ carthage update --platform iOS --no-build
+
+Now in the `Carthage/Checkout` directory has `Cucumberish/Cucumberish`. drag to target as with option "**Create groups" and "Copy items if needed**".
+
+Here is how to do that !
+
+![image](https://github.com/Shashikant86/XCFit-GIFS/blob/master/Carthage.gif)
+
 
-Please choose one of the suitable option for you. 
+Please choose one of the suitable option for you.
 
 We now have everything we needed to run demo Cucumber demo test. Update Scheme if don't want to run unit test or other type of tests.
 and press 'CMD+U'

data/XCFit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'XCFit'
-  s.version          = '2.0.0'
+  s.version          = '3.0.6'
   s.summary          = 'Full Stack BDD for iOS and macOS Apps with Swift, Xcode using XCUITest, Cucumberish, FitNesse and friends.'
 
   s.description      = <<-DESC
@@ -16,19 +16,9 @@ XCFit is a full stack BDD framework for iOS and macOS apps with Swift using Cucu
   s.social_media_url = 'https://twitter.com/Shashikant86'
 
   s.ios.deployment_target = '9.0'
-  s.source_files  = 'XCFit/Classes/Cucumberish/*.{h,m}', 'XCFit/Classes/Cucumberish/Core/Managers/*.{h,m}', 'XCFit/Classes/Cucumberish/Core/Models/*.{h,m}', 'XCFit/Classes/Cucumberish/Utils/*.{h,m}', 'XCFit/Classes/Cucumberish/Dependencies/Gherkin', 'XCFit/Classes/Cucumberish/Core/CCIBlockDefinitions.h'
-  s.public_header_files =
-    'XCFit/Classes/Cucumberish/Cucumberish.h',
-    'XCFit/Classes/Cucumberish/Core/Managers/CCIStepsManager.h',
-    'XCFit/Classes/Cucumberish/Core/CCIBlockDefinitions.h',
-    'XCFit/Classes/Cucumberish/Core/Models/CCIScenarioDefinition.h',
-    'XCFit/Classes/Cucumberish/Core/Models/CCIExample.h',
-    'XCFit/Classes/Cucumberish/Core/Models/CCIStep.h',
-    'XCFit/Classes/Cucumberish/Core/Models/CCILocation.h',
-    'XCFit/Classes/Cucumberish/Core/Models/CCIArgument.h'
-  s.resource_bundles = {
-    'GherkinLanguages' => ['XCFit/Classes/Cucumberish/Dependencies/Gherkin/gherkin-languages.json'],
-  }
-   s.framework  = "XCTest"
-   s.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => "SRC_ROOT=@\\\"$(SRCROOT)\\\"" }
+  s.source_files = 'Sources/*.swift'
+  s.framework = "XCTest"
+  s.dependency 'Cucumberish'
+  s.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => "SRC_ROOT=@\\\"$(SRCROOT)\\\"" }
+  s.xcconfig = { "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES" => "NO" }
 end

data/XCFit_Templates/XCFit/Cucumberish UI Test Bundle Base.xctemplate/BaseScreen.swift

@@ -5,37 +5,39 @@
 //
 
 /*
- 
+
  This is sample code created by XCFit Framework and can be edited/Removed as per your project need. You can also re-arrange Xcode Groups and directories as per your need.
- 
+
  This assumes that your apps is made up of multiple screens. All the common varibales, functions, related to screens can be put here. This class will be perent class of your individual screen.
- 
+
  */
 
 import XCTest
 import Foundation
 
 class BaseScreen: XCTestCase {
+
+    // Add your own methods to base class e.g
     
     func waitAndTap(element: XCUIElement) {
-        
+
         let exists = NSPredicate(format: "exists == true")
-        
+
         self.expectation(for: exists, evaluatedWith: element, handler: nil)
         self.waitForExpectations(timeout: 10, handler: nil)
-        
+
         element.tap()
-        
+
     }
-    
-    
+
+
     func waitForExist(element: XCUIElement) {
-        
+
         let exists = NSPredicate(format: "exists == true")
-        
+
         self.expectation(for: exists, evaluatedWith: element, handler: nil)
         self.waitForExpectations(timeout: 10, handler: nil)
         XCTAssert(element.exists)
-        
+
     }
 }

data/XCFit_Templates/XCFit/Cucumberish UI Test Bundle Base.xctemplate/CommonStepDefinitions.swift

@@ -6,19 +6,20 @@
 //
 
 /*
- 
+
  This is sample code created by XCFit Framework and can be edited/Removed as per your project need. You can also re-arrange Xcode Groups and directories as per your need.
- 
- This class has some mostly used step definitions included here. You can add some more here if needed. 
- 
+
+ This class has some mostly used step definitions included here. You can add some more here if needed.
+
  */
 
 import XCTest
+import Cucumberish
 
 class CommonStepDefinitions: NSObject {
-    
+
     fileprivate var application : XCUIApplication!
-    
+
     fileprivate func elementByLabel(_ label : String, type: String) -> XCUIElement
     {
         var elementQurey : XCUIElementQuery!
@@ -39,7 +40,7 @@ class CommonStepDefinitions: NSObject {
         }
         return elementQurey[label]
     }
-    
+
     fileprivate func setup(_ application: XCUIApplication)
     {
         self.application = application
@@ -49,7 +50,7 @@ class CommonStepDefinitions: NSObject {
             let type = args?[1]
             self.elementByLabel(label!, type: type!).tap()
         }
-        
+
         //And/When/Then/But I tap the "Increment" button 5 times
         MatchAll("^I tap (?:the )?\"([^\\\"]*)\" (button|label|tab|view) ([1-9]{1}) time(?:s)?$") { (args, userInfo) -> Void in
             let label = args?[0]
@@ -61,7 +62,7 @@ class CommonStepDefinitions: NSObject {
             }
         }
         //             Then I write "Ahmed Ali" into the "Name" field
-        
+
         //When/And/But/When I write "Ahmed" in the "Name" field
         MatchAll("^I write \"([^\\\"]*)\" (?:into|in) (?:the )?\"([^\\\"]*)\" (field|text view)$") { (args, userInfo) -> Void in
             let type = args?[2]
@@ -70,8 +71,8 @@ class CommonStepDefinitions: NSObject {
             element.tap()
             element.typeText((args?[0])!)
         }
-        
-        
+
+
         MatchAll("^I switch (on|off) the \"([^\\\"]*)\" switch$") { (args, userInfo) -> Void in
             let theSwitch = application.switches[(args?[1])!]
             let currentValu = NSString(string: theSwitch.value as! String).integerValue
@@ -79,12 +80,12 @@ class CommonStepDefinitions: NSObject {
             if(currentValu != newValue){
                 theSwitch.tap()
             }
-            
+
         }
-        
-        
+
+
     }
-    
+
     class func setup(_ application: XCUIApplication)
     {
         CommonStepDefinitions().setup(application)

data/XCFit_Templates/XCFit/Cucumberish UI Test Bundle Base.xctemplate/Extensions.swift

@@ -6,26 +6,26 @@
 //
 
 /*
- 
+
  This is sample code created by XCFit Framework and can be edited/Removed as per your project need. You can also re-arrange Xcode Groups and directories as per your need.
- 
+
  This file can take all the Swift extensions build around XCUI Test Frameworks which can be directly used in the tests, page objects. Here are sample extensions on XCUIElement and XCTestCase.
- 
+
  */
 
 import Foundation
 import XCTest
 
 extension XCUIElement {
-    
+
     public func tapOnceVisible(testCase: XCTestCase,
                                file: String = #file, line: UInt = #line) {
         let existsPredicate = NSPredicate(format: "exists == true")
-        
-        
+
+
         testCase.expectation(for: existsPredicate,
                              evaluatedWith: self, handler: nil)
-        
+
         testCase.waitForExpectations(timeout: 20) { (error) -> Void in
             if (error != nil) {
                 let message = "Failed to find \(self) after 20 seconds."
@@ -33,11 +33,11 @@ extension XCUIElement {
                                        inFile: file, atLine: line, expected: true)
             }
         }
-        
+
         self.tap()
     }
-    
-    
+
+
 }
 
 extension XCTestCase {
@@ -46,7 +46,7 @@ extension XCTestCase {
         let existsPredicate = NSPredicate(format: "exists == true")
         expectation(for: existsPredicate,
                     evaluatedWith: element, handler: nil)
-        
+
         waitForExpectations(timeout: 20) { (error) -> Void in
             if (error != nil) {
                 let message = "Failed to find \(element) after 5 seconds."

data/XCFit_Templates/XCFit/Cucumberish UI Test Bundle Base.xctemplate/HomeScreen.swift

@@ -5,9 +5,9 @@
 //
 
 /*
- 
+
  This is sample code created by XCFit Framework and can be edited/Removed as per your project need. You can also re-arrange Xcode Groups and directories as per your need.
- 
+
  This assumes that your apps is made up of multiple screens. You can write individual screen class which extend BaseScreen. All the functionality related to screen can be included in this class.
  */
 
@@ -16,9 +16,9 @@ import XCTest
 
 
 class HomeScreen: BaseScreen {
-    
+
     // You can add locators and functions of homeScreen here
-    
+
    let crappyButtuon = XCUIApplication().buttons["I am really useless button"]
-    
+
 }