Skip to content

Commit

Permalink
Eliminated vendored copies of testing libraries in favor of Cocoapods…
Browse files Browse the repository at this point in the history
…. Add Kiwi to testing stack
  • Loading branch information
blakewatters committed Oct 4, 2012
1 parent 30c936f commit 73cd7a6
Show file tree
Hide file tree
Showing 168 changed files with 118 additions and 8,640 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@ Docs/API

Examples/RKDiscussionBoardExample/discussion_board_backend/public/system/attachments/*

test-reports/
test-reports/

# CocoaPods
Pods
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ gem 'xcoder', :git => "git://github.com/rayh/xcoder.git"
gem 'restkit', :git => 'git://github.com/RestKit/RestKit-Gem.git'
gem 'debugger', '1.2.0'
gem 'faker', '1.1.2'
gem 'cocoapods', '0.15.0'
33 changes: 33 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,22 @@ GIT
GEM
remote: http://rubygems.org/
specs:
activesupport (3.2.8)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
builder (3.1.3)
cocoapods (0.15.0)
activesupport (~> 3.2.6)
colored (~> 1.2)
escape (~> 0.0.4)
faraday (~> 0.8.1)
json (~> 1.7.3)
octokit (~> 1.7)
open4 (~> 1.3.0)
rake (~> 0.9.0)
xcodeproj (>= 0.3.4)
colored (1.2)
columnize (0.3.6)
daemons (1.1.9)
debugger (1.2.0)
Expand All @@ -37,13 +52,28 @@ GEM
debugger-linecache (1.1.2)
debugger-ruby_core_source (>= 1.1.1)
debugger-ruby_core_source (1.1.3)
escape (0.0.4)
eventmachine (1.0.0)
faker (1.1.2)
i18n (~> 0.5)
faraday (0.8.4)
multipart-post (~> 1.1)
faraday_middleware (0.8.8)
faraday (>= 0.7.4, < 0.9)
hashie (1.2.0)
i18n (0.6.1)
json (1.7.5)
mime-types (1.19)
multi_json (1.3.6)
multipart-post (1.1.5)
nokogiri (1.5.5)
octokit (1.15.1)
addressable (~> 2.2)
faraday (~> 0.8)
faraday_middleware (~> 0.8)
hashie (~> 1.2)
multi_json (~> 1.3)
open4 (1.3.0)
plist (3.1.0)
rack (1.4.1)
rack-protection (1.2.0)
Expand All @@ -56,12 +86,15 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
tilt (1.3.3)
xcodeproj (0.3.4)
activesupport (~> 3.2.6)

PLATFORMS
ruby

DEPENDENCIES
bundler (~> 1.2.0)
cocoapods (= 0.15.0)
debugger (= 1.2.0)
faker (= 1.1.2)
rake (~> 0.9.0)
Expand Down
7 changes: 7 additions & 0 deletions Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
platform :ios, '5.0'
link_with ['RestKitTests', 'RestKitFrameworkTests']
inhibit_all_warnings!

pod 'Kiwi', '1.1.0'
pod 'OCMock', '2.0.1'
pod 'OCHamcrest', '1.8'
17 changes: 17 additions & 0 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

PODS:
- Kiwi (1.1.0)
- OCHamcrest (1.8)
- OCMock (2.0.1)

DEPENDENCIES:
- Kiwi (= 1.1.0)
- OCHamcrest (= 1.8)
- OCMock (= 2.0.1)

SPEC CHECKSUMS:
Kiwi: 9141d15cf4f52a2178139ea16722f021b4059906
OCHamcrest: 75258b3746b118ed9de96a6a8d985546f32e0f9b
OCMock: 77a9c4c57af6bf258a537d34cf09abf422affede

COCOAPODS: 0.15.0
355 changes: 54 additions & 301 deletions RestKit.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

34 changes: 1 addition & 33 deletions RestKit.xcworkspace/contents.xcworkspacedata

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

2 changes: 1 addition & 1 deletion Tests/RKTestEnvironment.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#import <OCMock/NSNotificationCenter+OCMAdditions.h>

#define HC_SHORTHAND
#import <OCHamcrestIOS/OCHamcrestIOS.h>
#import "OCHamcrest.h"
#import <SenTestingKit/SenTestingKit.h>

#import "RestKit.h"
Expand Down
1 change: 0 additions & 1 deletion Tests/Vendor/OCHamcrest/OCHamcrest.framework/Headers

This file was deleted.

1 change: 0 additions & 1 deletion Tests/Vendor/OCHamcrest/OCHamcrest.framework/OCHamcrest

This file was deleted.

1 change: 0 additions & 1 deletion Tests/Vendor/OCHamcrest/OCHamcrest.framework/Resources

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 73cd7a6

Please sign in to comment.