Skip to content

Commit

Permalink
tests: updated.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lolgear
lolgear committed Feb 5, 2017
1 parent b722f54 commit b41fc7d
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ script:
- pod install --project-directory=Tests
# 32-bit tests
- echo Run iOS Tests
- xcodebuild test -workspace 'Tests/JWT Tests.xcworkspace/' -scheme 'iOS_Tests' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 5,OS=latest' | xcpretty -c
- xcodebuild test -workspace 'Tests/Tests.xcworkspace/' -scheme 'iOS_Tests' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 5,OS=latest' | xcpretty -c
# 64-bit tests
- xcodebuild test -workspace 'Tests/JWT Tests.xcworkspace/' -scheme 'iOS_Tests' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 5s,OS=latest' | xcpretty -c
- xcodebuild test -workspace 'Tests/Tests.xcworkspace/' -scheme 'iOS_Tests' -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 5s,OS=latest' | xcpretty -c
# mac OS tests
# UNCOMMENT WHEN READY!
# - echo Run Mac OS Tests
Expand Down
0 ...ms/Test certificate and private key 1.p12 → ...ts/Test certificate and private key 1.p12
View file
File renamed without changes.
0 ...ms/Test certificate and private key 2.p12 → ...ts/Test certificate and private key 2.p12
View file
File renamed without changes.
0 ...hms/Test certificate and public key 1.pem → ...pts/Test certificate and public key 1.pem
View file
File renamed without changes.
0 ...hms/Test certificate and public key 2.pem → ...pts/Test certificate and public key 2.pem
View file
File renamed without changes.
5 changes: 2 additions & 3 deletions Tests/Podfile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
source 'https://github.com/CocoaPods/Specs'

def framework_name
'JWT'
'JWT'
end

xcodeproj framework_name + ' ' + 'Tests'
#workspace '../Framework/JWT'
xcodeproj 'Tests'
inhibit_all_warnings!

def import_pods
Expand Down
2 changes: 1 addition & 1 deletion Tests/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ SPEC CHECKSUMS:
JWT: 033b401ec3935ef009e0eddfd529f56bb4ab8724
Kiwi: f49c9d54b28917df5928fe44968a39ed198cb8a8

PODFILE CHECKSUM: ff7603a55b6a1be7ba8ea4473ecf3ce38d656d06
PODFILE CHECKSUM: c75c7cf114c84da4136ca88e1af74b58b1b83616

COCOAPODS: 1.0.0
12 changes: 10 additions & 2 deletions Tests/JWT Tests.xcodeproj/project.pbxproj → Tests/Tests.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
045147881D5E312A007B1D7A /* JWTAlgorithmRS256Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0451476A1D5E310E007B1D7A /* JWTAlgorithmRS256Tests.m */; };
0451478D1D5E312A007B1D7A /* JWTClaimsSerializerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 045147701D5E310E007B1D7A /* JWTClaimsSerializerSpec.m */; };
0451478F1D5E312A007B1D7A /* JWTSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 045147731D5E310E007B1D7A /* JWTSpec.m */; };
049C0DF41E47A38C0062B8C3 /* private_256_right.pem in Resources */ = {isa = PBXBuildFile; fileRef = 049C0DF21E47A38C0062B8C3 /* private_256_right.pem */; };
049C0DF51E47A38C0062B8C3 /* private_256_wrong.pem in Resources */ = {isa = PBXBuildFile; fileRef = 049C0DF31E47A38C0062B8C3 /* private_256_wrong.pem */; };
04A5A58A1DF14FE300FBDF4C /* JWTMarkdownSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 04A5A5891DF14FE300FBDF4C /* JWTMarkdownSpec.m */; };
04EBA9041E3D099B0025090A /* private_256_right.p12 in Resources */ = {isa = PBXBuildFile; fileRef = 04EBA9001E3D099B0025090A /* private_256_right.p12 */; };
04EBA9051E3D099B0025090A /* private_256_wrong.p12 in Resources */ = {isa = PBXBuildFile; fileRef = 04EBA9011E3D099B0025090A /* private_256_wrong.p12 */; };
Expand All @@ -46,6 +48,8 @@
0451476A1D5E310E007B1D7A /* JWTAlgorithmRS256Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JWTAlgorithmRS256Tests.m; sourceTree = "<group>"; };
045147701D5E310E007B1D7A /* JWTClaimsSerializerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JWTClaimsSerializerSpec.m; sourceTree = "<group>"; };
045147731D5E310E007B1D7A /* JWTSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JWTSpec.m; sourceTree = "<group>"; };
049C0DF21E47A38C0062B8C3 /* private_256_right.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = private_256_right.pem; sourceTree = "<group>"; };
049C0DF31E47A38C0062B8C3 /* private_256_wrong.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = private_256_wrong.pem; sourceTree = "<group>"; };
04A5A5891DF14FE300FBDF4C /* JWTMarkdownSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JWTMarkdownSpec.m; sourceTree = "<group>"; };
04EBA9001E3D099B0025090A /* private_256_right.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; path = private_256_right.p12; sourceTree = "<group>"; };
04EBA9011E3D099B0025090A /* private_256_wrong.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; path = private_256_wrong.p12; sourceTree = "<group>"; };
Expand Down Expand Up @@ -129,6 +133,8 @@
045147651D5E310E007B1D7A /* Algorithms */ = {
isa = PBXGroup;
children = (
049C0DF21E47A38C0062B8C3 /* private_256_right.pem */,
049C0DF31E47A38C0062B8C3 /* private_256_wrong.pem */,
04EBA9001E3D099B0025090A /* private_256_right.p12 */,
04EBA9011E3D099B0025090A /* private_256_wrong.p12 */,
04EBA9021E3D099B0025090A /* public_256_right.pem */,
Expand Down Expand Up @@ -239,7 +245,7 @@
};
};
};
buildConfigurationList = 0451472C1D5E2F93007B1D7A /* Build configuration list for PBXProject "JWT Tests" */;
buildConfigurationList = 0451472C1D5E2F93007B1D7A /* Build configuration list for PBXProject "Tests" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
Expand All @@ -262,6 +268,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
049C0DF51E47A38C0062B8C3 /* private_256_wrong.pem in Resources */,
049C0DF41E47A38C0062B8C3 /* private_256_right.pem in Resources */,
04EBA9041E3D099B0025090A /* private_256_right.p12 in Resources */,
04EBA9051E3D099B0025090A /* private_256_wrong.p12 in Resources */,
04EBA9061E3D099B0025090A /* public_256_right.pem in Resources */,
Expand Down Expand Up @@ -650,7 +658,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
0451472C1D5E2F93007B1D7A /* Build configuration list for PBXProject "JWT Tests" */ = {
0451472C1D5E2F93007B1D7A /* Build configuration list for PBXProject "Tests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
0451472D1D5E2F93007B1D7A /* Debug */,
Expand Down
0 ...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
View file
File renamed without changes.
15 changes: 14 additions & 1 deletion ...xcshareddata/xcschemes/iOS_Tests.xcscheme → ...xcshareddata/xcschemes/iOS_Tests.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForRunning = "YES"
buildForTesting = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "045147321D5E2FF0007B1D7A"
BuildableName = "iOS_Tests.xctest"
BlueprintName = "iOS_Tests"
ReferencedContainer = "container:Tests.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
Expand All @@ -19,7 +32,7 @@
BlueprintIdentifier = "045147321D5E2FF0007B1D7A"
BuildableName = "iOS_Tests.xctest"
BlueprintName = "iOS_Tests"
ReferencedContainer = "container:JWT Tests.xcodeproj">
ReferencedContainer = "container:Tests.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
Expand Down
15 changes: 14 additions & 1 deletion ...shareddata/xcschemes/macOS_Tests.xcscheme → ...shareddata/xcschemes/macOS_Tests.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForRunning = "YES"
buildForTesting = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0451473F1D5E3004007B1D7A"
BuildableName = "macOS_Tests.xctest"
BlueprintName = "macOS_Tests"
ReferencedContainer = "container:Tests.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
Expand All @@ -19,7 +32,7 @@
BlueprintIdentifier = "0451473F1D5E3004007B1D7A"
BuildableName = "macOS_Tests.xctest"
BlueprintName = "macOS_Tests"
ReferencedContainer = "container:JWT Tests.xcodeproj">
ReferencedContainer = "container:Tests.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
Expand Down
2 changes: 1 addition & 1 deletion ...ests.xcworkspace/contents.xcworkspacedata → ...ests.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b41fc7d

Please sign in to comment.