Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
language: objective-c
before_install:
- brew unlink xctool
- brew install xctool --HEAD
- sudo easy_install cpp-coveralls
- export LANG=en_US.UTF-8
- gem install cocoapods
Expand Down
2 changes: 1 addition & 1 deletion Classes/Models/CJArtist.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma mark - Core properties

@property(nonatomic, strong) NSString *name;
@property(nonatomic, strong) NSString *description;
@property(nonatomic, strong) NSString *about;
@property(nonatomic, assign) BOOL following;
@property(nonatomic, strong) NSNumber *followersCount;
@property(nonatomic, strong) NSNumber *commentsCount;
Expand Down
2 changes: 1 addition & 1 deletion Classes/Models/CJArtist.m
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ - (instancetype)initWithInfo:(NSDictionary *)info
if (self && info) {
// Core properties
_name = info[kArtistName];
_description = info[kArtistDescription];
_about = info[kArtistDescription];
_following = [info[kArtistFollowing] boolValue];
_followersCount = info[kArtistFollowersCount];
_commentsCount = info[kArtistCommentsCount];
Expand Down
2 changes: 1 addition & 1 deletion Classes/Models/CJEvent.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

@property(nonatomic, strong) NSString *name;
@property(nonatomic, strong) NSArray *flyers;
@property(nonatomic, strong) NSString *description;
@property(nonatomic, strong) NSString *about;
@property(nonatomic, strong) NSDate *startsAt;
@property(nonatomic, strong) NSDate *endsAt;
@property(nonatomic, strong) NSDate *reviewEndsAt;
Expand Down
2 changes: 1 addition & 1 deletion Classes/Models/CJEvent.m
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ - (instancetype)initWithInfo:(NSDictionary *)info
_name = info[kEventName];
_background = info[kEventBackground];
_flyers = info[kEventFlyers];
_description = info[kEventDescription];
_about = info[kEventDescription];
_startsAt = [NSDate dateWithISO8601String:info[kEventStartsAt]];
_endsAt = [NSDate dateWithISO8601String:info[kEventEndsAt]];
_reviewEndsAt = [NSDate dateWithISO8601String:info[kEventReviewEndsAt]];
Expand Down
2 changes: 1 addition & 1 deletion Classes/Models/CJVenue.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#pragma mark - Core properties

@property(nonatomic, strong) NSString *name;
@property(nonatomic, strong) NSString *description;
@property(nonatomic, strong) NSString *about;
@property(nonatomic, assign) BOOL following;
@property(nonatomic, strong) NSDate *updatedAt;
@property(nonatomic, strong) NSNumber *followersCount;
Expand Down
2 changes: 1 addition & 1 deletion Classes/Models/CJVenue.m
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ - (instancetype)initWithInfo:(NSDictionary *)info
if (self && info) {
// Core properties
_name = info[kVenueName];
_description = info[kVenueDescription];
_about = info[kVenueDescription];
_updatedAt = [NSDate dateWithISO8601String:info[kVenueUpdatedAt]];
_following = [info[kVenueFollowing] boolValue];
_followersCount = info[kVenueFollowersCount];
Expand Down
4 changes: 2 additions & 2 deletions Example/CJKitTests/CJArtistTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@
});
});

describe(@"#description", ^{
describe(@"#about", ^{
it(@"produces a correct mapping", ^{
[[artist.description should] equal:stub[@"description"]];
[[artist.about should] equal:stub[@"description"]];
});
});

Expand Down
4 changes: 2 additions & 2 deletions Example/CJKitTests/CJEventTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ - (BOOL)isRetinaDisplay;
});
});

describe(@"#description", ^{
describe(@"#about", ^{
it(@"produces a correct mapping", ^{
[[event.description should] equal:stub[@"description"]];
[[event.about should] equal:stub[@"description"]];
});
});

Expand Down
4 changes: 2 additions & 2 deletions Example/CJKitTests/CJVenueTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ - (BOOL)isRetinaDisplay;
});
});

describe(@"#description", ^{
describe(@"#about", ^{
it(@"produces a correct mapping", ^{
[[venue.description should] equal:stub[@"description"]];
[[venue.about should] equal:stub[@"description"]];
});
});

Expand Down
2 changes: 1 addition & 1 deletion Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ target :CJKit do
end

target :CJKitTests, :exclusive => true do
pod 'Kiwi/XCTest', "~> 2.2.4"
pod 'Kiwi'
pod 'OHHTTPStubs'
end
2 changes: 1 addition & 1 deletion Example/Pods/BuildHeaders/Kiwi/KWMessagePattern.h

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

1 change: 0 additions & 1 deletion Example/Pods/BuildHeaders/Kiwi/KWRaiseMatcher.h

This file was deleted.

1 change: 1 addition & 0 deletions Example/Pods/BuildHeaders/Kiwi/KWSuiteConfigurationBase.h

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

2 changes: 1 addition & 1 deletion Example/Pods/Headers/Kiwi/KWMessagePattern.h

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

1 change: 0 additions & 1 deletion Example/Pods/Headers/Kiwi/KWRaiseMatcher.h

This file was deleted.

1 change: 1 addition & 0 deletions Example/Pods/Headers/Kiwi/KWSuiteConfigurationBase.h

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

51 changes: 51 additions & 0 deletions Example/Pods/Kiwi/Classes/Config/KWAllTestsSuite.m

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

26 changes: 26 additions & 0 deletions Example/Pods/Kiwi/Classes/Config/KWSuiteConfigurationBase.h

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

77 changes: 77 additions & 0 deletions Example/Pods/Kiwi/Classes/Config/KWSuiteConfigurationBase.m

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

6 changes: 3 additions & 3 deletions Example/Pods/Kiwi/Classes/Core/KWExample.h

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

8 changes: 3 additions & 5 deletions Example/Pods/Kiwi/Classes/Core/KWExample.m

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

4 changes: 1 addition & 3 deletions Example/Pods/Kiwi/Classes/Core/KWExampleSuite.h

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

6 changes: 3 additions & 3 deletions Example/Pods/Kiwi/Classes/Core/KWExampleSuite.m

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

4 changes: 0 additions & 4 deletions Example/Pods/Kiwi/Classes/Core/KWFailure.h

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

Loading