Rework checkout+notify tests to clarify expected behavior

Author: dleehr

ObjectiveGitTests/GTRepositorySpec.m

@@ -14,8 +14,8 @@
 
 QuickSpecBegin(GTRepositorySpec)
 
-static NSString * const mainFile = @"main.m";
-static NSString * const readmeFile = @"README1.txt";
+static NSString * const readmeFile = @"README.md";
+static NSString * const readme1File = @"README1.txt";
 
 
 __block GTRepository *repository;
@@ -381,58 +381,54 @@
 });
 
 describe(@"-checkout:strategy:notifyFlags:error:notifyBlock:progressBlock:", ^{
-	it(@"should fail ref checkout with dirty file and notify", ^{
+	it(@"should fail ref checkout with conflict and notify", ^{
 		NSError *error = nil;
 		GTReference *ref = [repository lookUpReferenceWithName:@"refs/heads/other-branch" error:&error];
 		expect(ref).notTo(beNil());
 		expect(error.localizedDescription).to(beNil());
-		BOOL writeResult = [@"Replacement data in main.m\n" writeToURL:[repository.fileURL URLByAppendingPathComponent:mainFile] atomically:YES encoding:NSUTF8StringEncoding error:&error];
+		BOOL writeResult = [@"Conflicting data in README.md\n" writeToURL:[repository.fileURL URLByAppendingPathComponent:readmeFile] atomically:YES encoding:NSUTF8StringEncoding error:&error];
 		expect(@(writeResult)).to(beTruthy());
 		__block NSUInteger notifyCount = 0;
-		__block BOOL mainFileDirty = NO;
+		__block BOOL readmeFileConflicted = NO;
 		int (^notifyBlock)(GTCheckoutNotifyFlags, NSString *, GTDiffFile *, GTDiffFile *, GTDiffFile *);
 		notifyBlock = ^(GTCheckoutNotifyFlags why, NSString *path, GTDiffFile *baseline, GTDiffFile *target, GTDiffFile *workdir) {
 			notifyCount++;
-			if([path isEqualToString:mainFile] && (why & GTCheckoutNotifyDirty)) {
-				mainFileDirty = YES;
-				return GIT_EUSER;
-			} else {
-				return 0;
+			if([path isEqualToString:readmeFile] && (why & GTCheckoutNotifyConflict)) {
+				readmeFileConflicted = YES;
 			}
+			return 0;
 		};
 
-		BOOL result = [repository checkoutReference:ref strategy:GTCheckoutStrategySafe notifyFlags:GTCheckoutNotifyDirty error:&error progressBlock:nil notifyBlock:notifyBlock];
+		BOOL result = [repository checkoutReference:ref strategy:GTCheckoutStrategySafe notifyFlags:GTCheckoutNotifyConflict error:&error progressBlock:nil notifyBlock:notifyBlock];
 		expect(@(notifyCount)).to(equal(@(1)));
-		expect(@(mainFileDirty)).to(beTruthy());
+		expect(@(readmeFileConflicted)).to(beTruthy());
 		expect(@(result)).to(beFalsy());
-		expect(@(error.code)).to(equal(@(GIT_EUSER)));
+		expect(@(error.code)).to(equal(@(GIT_ECONFLICT)));
 	});
 
-	it(@"should fail commit checkout with dirty file and notify", ^{
+	it(@"should fail commit checkout with conflict and notify", ^{
 		NSError *error = nil;
 		GTCommit *commit = [repository lookUpObjectBySHA:@"1d69f3c0aeaf0d62e25591987b93b8ffc53abd77" objectType:GTObjectTypeCommit error:&error];
 		expect(commit).notTo(beNil());
 		expect(error.localizedDescription).to(beNil());
-		BOOL writeResult = [@"Replacement data in README\n" writeToURL:[repository.fileURL URLByAppendingPathComponent:readmeFile] atomically:YES encoding:NSUTF8StringEncoding error:&error];
+		BOOL writeResult = [@"Conflicting data in README1.txt\n" writeToURL:[repository.fileURL URLByAppendingPathComponent:readme1File] atomically:YES encoding:NSUTF8StringEncoding error:&error];
 		expect(@(writeResult)).to(beTruthy());
 		__block NSUInteger notifyCount = 0;
-		__block BOOL readmeFileDirty = NO;
+		__block BOOL readme1FileConflicted = NO;
 		int (^notifyBlock)(GTCheckoutNotifyFlags, NSString *, GTDiffFile *, GTDiffFile *, GTDiffFile *);
 		notifyBlock = ^(GTCheckoutNotifyFlags why, NSString *path, GTDiffFile *baseline, GTDiffFile *target, GTDiffFile *workdir) {
 			notifyCount++;
-			if([path isEqualToString:readmeFile] && (why & GTCheckoutNotifyDirty)) {
-				readmeFileDirty = YES;
-				return GIT_EUSER;
-			} else {
-				return 0;
+			if([path isEqualToString:readme1File] && (why & GTCheckoutNotifyConflict)) {
+				readme1FileConflicted = YES;
 			}
+			return 0;
 		};
 
-		BOOL result = [repository checkoutCommit:commit strategy:GTCheckoutStrategySafe notifyFlags:GTCheckoutNotifyDirty error:&error progressBlock:nil notifyBlock:notifyBlock];
+		BOOL result = [repository checkoutCommit:commit strategy:GTCheckoutStrategySafe notifyFlags:GTCheckoutNotifyConflict error:&error progressBlock:nil notifyBlock:notifyBlock];
 		expect(@(notifyCount)).to(equal(@(1)));
-		expect(@(readmeFileDirty)).to(beTruthy());
+		expect(@(readme1FileConflicted)).to(beTruthy());
 		expect(@(result)).to(beFalsy());
-		expect(@(error.code)).to(equal(@(GIT_EUSER)));
+		expect(@(error.code)).to(equal(@(GIT_ECONFLICT)));
 	});
 });