Join all test in single Scheme

auth0 · Jun 8, 2016 · 57bef40 · 57bef40
1 parent 28d9fb7
commit 57bef40
Show file tree

Hide file tree

Showing 14 changed files with 3,564 additions and 1,517 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,10 +10,10 @@ env:
   - secure: uTPLza4Mw7BTFq19g9tzfU3vkOWAzTqV4+HZMDrRalAeeZd6jNezt6WgyTgSIEUfe78L9doO4xrVtVw1nURzfcrSWexZCR2RYrZIvR9JrWbjY57rweOAMT6tO8XS59dcbnqlqdosOJO0M2wtVw4Hkany0VmOJaVqy9+2pj9SMfBnFz+lJvJpBo2lUcn927PbHP0b422kPdxdy7r9yIBY08gAWHdhHlJI/mN6KlHji2tRSEGCJ2yG9CAXnOTKSnzx0gBbnJmVSKEqAjJSuZltynVU67JuEx/QxB5wsD2N0BTt1Xvq4DaDu3cMLbJWnQp2XNMmW1nKcj4CZikEADICa3IYckyo6/13Jd5bOby7akd+ov6F6M9LIRYTEY611TuPOzU9BsdPpAbnK+9Rt3hR1HmwDFHTshRkhAaHTuxZQV6p/58xPXf1iSJZ/wpDLSrshMa/GxRFubm10gUqG/eH/PdbdVYmi5tWlsd6rwgXefrXTBFYDWttisuvvNTN1KZbjvDt0DPGRBIFrqcBRe8X8EfTIWXvUmsWC2DxstanBZnxkB8XOC+SBvN42B8PQHKrg/FJFnR7ezFSIFM6zx0De4FfTiS0iJoz2nuomkqnssxhDDnazYTcPFJpy0YiHOJtfD/5gnNfV6WlxotoOozzXcEb/NJa73TU+2XYqeQCDkQ=
   - secure: l3t/BRbXLNRUoB6CtPPcquOh1JDFytqPZWWKM5p9KAfxdRHDxeAnm0+ulYcTFRueQMJsrlm0AZHCyHia6ECMd/XzD1M9HeEPYy9kdwXwIQ0N8a0ySci6Cydt+6i/lWP3H+hI4/U7ZHV66aU17wWcen9cn9izu6vuwjajz1gsP5qMoJoMc+v9CHl+e/uhWlDBFZxvB2q+rcBQnuffF7OtiRK5aeC/lyLeIPXqzN0ScBtRhlU4EbMCVtuOlzOLF35PHLyruQ0o6oeJT5V65pSHjGdyj3JJg0sL7uQvTpQUL9nZrehDLd0uCAGNyUUuC3FOjwIknJTN+TdYPq5AEdvnaf15iFIRF5YuXFQ7UGna7L17SsAbepy+Xzm5NEsz/YvhuIvuxembUT07ZM/C92z2jpFxFckjbb3alqQQP1N13lurVBFNgyZ9+PwzIAlO20StjfEK4c/pxghTkFemnek0KxXPmxuWqBq2mSzoc4WWrVvKmw+57qVfAnxxWcshx97RWBlvGVqiedVK9fQ7ajyeuC/9JBrIpaapSTYq73QZ0iDTjgYkGfAecspn3T+zPdsoPazNy7h5xPunTfHG6nb6lTuvMrfOBG/dNdrBg1KlEnZlTW0gjBZIedcIaYS8Va6e5e9+e7FNcjQYDGnyvfoVuywYiLHRas4LYrsVc4E1SuI=
   matrix:
-  - SCHEME="All.iOS" IOS_DESTINATION_VERSION="9.0" CARTHAGE_BUILD_PLATFORM="iOS"
-  - SCHEME="All.iOS" IOS_DESTINATION_VERSION="9.1" CARTHAGE_BUILD_PLATFORM="iOS"
-  - SCHEME="All.iOS" IOS_DESTINATION_VERSION="9.2" CARTHAGE_BUILD_PLATFORM="iOS"
-  - SCHEME="All.iOS" IOS_DESTINATION_VERSION="9.3" CARTHAGE_BUILD_PLATFORM="iOS"
+  - SCHEME="Auth0.iOS" IOS_DESTINATION_VERSION="9.0" CARTHAGE_BUILD_PLATFORM="iOS"
+  - SCHEME="Auth0.iOS" IOS_DESTINATION_VERSION="9.1" CARTHAGE_BUILD_PLATFORM="iOS"
+  - SCHEME="Auth0.iOS" IOS_DESTINATION_VERSION="9.2" CARTHAGE_BUILD_PLATFORM="iOS"
+  - SCHEME="Auth0.iOS" IOS_DESTINATION_VERSION="9.3" CARTHAGE_BUILD_PLATFORM="iOS"
   - SCHEME="Auth0.OSX" CARTHAGE_BUILD_PLATFORM="OSX"
 before_install: true
 install: true

diff --git a/Auth0.xcodeproj/project.pbxproj b/Auth0.xcodeproj/project.pbxproj
diff --git a/Auth0.xcodeproj/xcshareddata/xcschemes/All.iOS.xcscheme b/Auth0.xcodeproj/xcshareddata/xcschemes/All.iOS.xcscheme
diff --git a/Auth0/OAuth2/A0ChallengeGenerator.h → Auth0/Auth0PKCE/A0ChallengeGenerator.h b/Auth0/OAuth2/A0ChallengeGenerator.h → Auth0/Auth0PKCE/A0ChallengeGenerator.h
diff --git a/Auth0/OAuth2/A0ChallengeGenerator.m → Auth0/Auth0PKCE/A0ChallengeGenerator.m b/Auth0/OAuth2/A0ChallengeGenerator.m → Auth0/Auth0PKCE/A0ChallengeGenerator.m
diff --git a/OAuth2Tests/ChallengeGeneratorSpec.swift → ...Tests/OAuth2/ChallengeGeneratorSpec.swift b/OAuth2Tests/ChallengeGeneratorSpec.swift → ...Tests/OAuth2/ChallengeGeneratorSpec.swift
diff --git a/...2Tests/ControllerModalPresenterSpec.swift → ...OAuth2/ControllerModalPresenterSpec.swift b/...2Tests/ControllerModalPresenterSpec.swift → ...OAuth2/ControllerModalPresenterSpec.swift
diff --git a/OAuth2Tests/OAuth2GrantSpec.swift → Auth0Tests/OAuth2/OAuth2GrantSpec.swift b/OAuth2Tests/OAuth2GrantSpec.swift → Auth0Tests/OAuth2/OAuth2GrantSpec.swift
diff --git a/OAuth2Tests/OAuth2SessionSpec.swift → Auth0Tests/OAuth2/OAuth2SessionSpec.swift b/OAuth2Tests/OAuth2SessionSpec.swift → Auth0Tests/OAuth2/OAuth2SessionSpec.swift
diff --git a/OAuth2Tests/OAuth2Spec.swift → Auth0Tests/OAuth2/OAuth2Spec.swift b/OAuth2Tests/OAuth2Spec.swift → Auth0Tests/OAuth2/OAuth2Spec.swift
diff --git a/OAuth2Tests/A0OAuth2Spec.m → Auth0Tests/ObjectiveC/A0OAuth2Spec.m b/OAuth2Tests/A0OAuth2Spec.m → Auth0Tests/ObjectiveC/A0OAuth2Spec.m
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'xcpretty'
+gem 'xcpretty-travis-formatter'
 gem 'carthage_cache', :git => 'https://github.com/hzalaz/carthage_cache', :branch => 'travis-for-oss-support'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -25,10 +25,12 @@ GEM
     rouge (1.10.1)
     xcpretty (0.2.2)
       rouge (~> 1.8)
+    xcpretty-travis-formatter (0.0.4)
+      xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   carthage_cache!
-  xcpretty
+  xcpretty-travis-formatter
diff --git a/OAuth2Tests/OAuth2Tests-Bridging-Header.h b/OAuth2Tests/OAuth2Tests-Bridging-Header.h