Merge remote-tracking branch 'origin/master' into HEAD

Conflicts: Expecta.xcodeproj/project.pbxproj RDD.md README.md
specta · Apr 18, 2015 · 9e5ef04 · 9e5ef04
2 parents 7fe9bd3 + fce2dc4
commit 9e5ef04
Show file tree

Hide file tree

Showing 143 changed files with 2,360 additions and 1,370 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,10 +3,6 @@
 xcuserdata
 .idea
 build/
+Products/
 *.pbxuser
 *.mode1v3
-
-products/*.h
-products/*.a
-products/LICENSE
-products/README.md
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,6 @@
 language: objective-c
-osx_image: mavericks
-script: test/support/objc-build-scripts/cibuild
+osx_image: xcode611
+
+script:
+  - rake clean
+  - Tests/Support/objc-build-scripts/cibuild
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,23 @@
-v0.3.0
+Next
 ======
+
+* Adds support for `match` for regular expressions [yomajkel]
+
+v0.4.0
+======
+
+* Adds `failure` syntax to force a test fail [orta]
+* Fix potential selector conflicts [paulsamuels]
+
+v0.3.2
+======
+
 * Adds support for Xcode/Apple LLVM 5.1, which means turning off Garbage Collection support [tonyarnold]
 * Raises minimum deployment targets to iOS 5.x and OS X 10.7 [tonyarnold]
-
+* Renamed `postNotification` to `notify` (with backwards compatability [gfontenot]
+* `notify` equality isn't based on raw pointer equals [gfontenot]
+* NSDecimalNumber & NSNumber comparison fixes [rolandkakonyi]
+* Added support for `.after(2.5)` to allow a forced timeout [iabudiab]
 
 v0.2.2
 ======

diff --git a/Expecta.podspec b/Expecta.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'Expecta'
-  s.version  = '0.3.0'
+  s.version  = '0.3.2'
   s.license  = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'A matcher framework for Objective-C & Cocoa.'
   s.homepage = 'http://github.com/petejkim/expecta'
@@ -16,11 +16,13 @@ Pod::Spec.new do |s|
     Jasmine before, you will feel right at home!
   }
 
-  s.source_files = 'src/**/*.{h,m}'
+  s.source_files = 'Expecta/**/*.{h,m}'
 
   s.requires_arc = false
-  s.ios.deployment_target = '5.0'
+  s.ios.deployment_target = '5.1.1'
   s.osx.deployment_target = '10.7'
 
-  s.frameworks = 'Foundation'
+  s.frameworks   = 'Foundation', 'XCTest'
+  s.osx.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '$(inherited) $(DEVELOPER_FRAMEWORKS_DIR) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(DEVELOPER_DIR)/Platforms/MacOSX.platform/Developer/Library/Frameworks"' }
+  s.ios.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '$(inherited) $(DEVELOPER_FRAMEWORKS_DIR) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks"' }
 end
diff --git a/Expecta.xcodeproj/project.pbxproj b/Expecta.xcodeproj/project.pbxproj
diff --git a/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta-iOS.xcscheme b/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0510"
+   LastUpgradeVersion = "0610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,8 +14,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E93067CD13B2E6D100EA26FF"
-               BuildableName = "libExpecta-iOS.a"
+               BlueprintIdentifier = "908379101A8B9660009844DA"
+               BuildableName = "Expecta.framework"
                BlueprintName = "Expecta-iOS"
                ReferencedContainer = "container:Expecta.xcodeproj">
             </BuildableReference>
@@ -32,13 +32,22 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E93067D913B2E6D100EA26FF"
-               BuildableName = "Expecta-iOSTests.octest"
+               BlueprintIdentifier = "3A0A59911AD441CB003DA3E4"
+               BuildableName = "Expecta-iOSTests.xctest"
                BlueprintName = "Expecta-iOSTests"
                ReferencedContainer = "container:Expecta.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "908379101A8B9660009844DA"
+            BuildableName = "Expecta.framework"
+            BlueprintName = "Expecta-iOS"
+            ReferencedContainer = "container:Expecta.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -49,6 +58,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "908379101A8B9660009844DA"
+            BuildableName = "Expecta.framework"
+            BlueprintName = "Expecta-iOS"
+            ReferencedContainer = "container:Expecta.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -58,6 +76,15 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "908379101A8B9660009844DA"
+            BuildableName = "Expecta.framework"
+            BlueprintName = "Expecta-iOS"
+            ReferencedContainer = "container:Expecta.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta.xcscheme b/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0510"
+   LastUpgradeVersion = "0610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,40 +14,12 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E9ACDF0B13B2DD520010F4D7"
-               BuildableName = "libExpecta.a"
+               BlueprintIdentifier = "908379781A8B972C009844DA"
+               BuildableName = "Expecta.framework"
                BlueprintName = "Expecta"
                ReferencedContainer = "container:Expecta.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E9ACDF1C13B2DD520010F4D7"
-               BuildableName = "ExpectaTests.octest"
-               BlueprintName = "ExpectaTests"
-               ReferencedContainer = "container:Expecta.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9C4416F817FF3F4A00978F09"
-               BuildableName = "ExpectaTests-XCTest.xctest"
-               BlueprintName = "ExpectaTests-XCTest"
-               ReferencedContainer = "container:Expecta.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -60,23 +32,22 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E9ACDF1C13B2DD520010F4D7"
-               BuildableName = "ExpectaTests.octest"
+               BlueprintIdentifier = "3A0A59601AD4418C003DA3E4"
+               BuildableName = "ExpectaTests.xctest"
                BlueprintName = "ExpectaTests"
                ReferencedContainer = "container:Expecta.xcodeproj">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9C4416F817FF3F4A00978F09"
-               BuildableName = "ExpectaTests-XCTest.xctest"
-               BlueprintName = "ExpectaTests-XCTest"
-               ReferencedContainer = "container:Expecta.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "908379781A8B972C009844DA"
+            BuildableName = "Expecta.framework"
+            BlueprintName = "Expecta"
+            ReferencedContainer = "container:Expecta.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -87,6 +58,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "908379781A8B972C009844DA"
+            BuildableName = "Expecta.framework"
+            BlueprintName = "Expecta"
+            ReferencedContainer = "container:Expecta.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -96,6 +76,15 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "908379781A8B972C009844DA"
+            BuildableName = "Expecta.framework"
+            BlueprintName = "Expecta"
+            ReferencedContainer = "container:Expecta.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta-iOS.xcscheme b/Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta-iOS.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0510"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E93067CD13B2E6D100EA26FF"
+               BuildableName = "libExpecta.a"
+               BlueprintName = "libExpecta-iOS"
+               ReferencedContainer = "container:Expecta.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E93067D913B2E6D100EA26FF"
+               BuildableName = "libExpecta-iOSTests.xctest"
+               BlueprintName = "libExpecta-iOSTests"
+               ReferencedContainer = "container:Expecta.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E93067CD13B2E6D100EA26FF"
+            BuildableName = "libExpecta.a"
+            BlueprintName = "libExpecta-iOS"
+            ReferencedContainer = "container:Expecta.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>