Add test for pushing single new commit to remote

Author: Ben Chatelain

ObjectiveGitTests/GTRemotePushSpec.m

@@ -14,12 +14,14 @@
 
 QuickSpecBegin(GTRemotePushSpec)
 
-describe(@"push to local filesystem bare repo", ^{
+describe(@"push to remote", ^{
 	__block GTRepository *localRepo;
 	__block GTRepository *remoteRepo;
 	__block GTRemote *remote;
+	__block NSURL *notBareRepoURL;
 	__block NSURL *remoteRepoFileURL;
 	__block NSURL *localRepoURL;
+	__block GTBranch *masterBranch;
 
 	beforeEach(^{
 		NSError *error = nil;
@@ -30,9 +32,9 @@
 		expect(@(notBareRepo.isBare)).to(beFalse());
 
 		// Make a bare clone to serve as the remote
-		NSURL *bareRepoURL = [notBareRepo.gitDirectoryURL.URLByDeletingLastPathComponent URLByAppendingPathComponent:@"barerepo.git"];
+		notBareRepoURL = [notBareRepo.gitDirectoryURL.URLByDeletingLastPathComponent URLByAppendingPathComponent:@"barerepo.git"];
 		NSDictionary *options = @{ GTRepositoryCloneOptionsBare: @(1) };
-		remoteRepo = [GTRepository cloneFromURL:notBareRepo.gitDirectoryURL toWorkingDirectory:bareRepoURL options:options error:&error transferProgressBlock:NULL checkoutProgressBlock:NULL];
+		remoteRepo = [GTRepository cloneFromURL:notBareRepo.gitDirectoryURL toWorkingDirectory:notBareRepoURL options:options error:&error transferProgressBlock:NULL checkoutProgressBlock:NULL];
 		expect(error).to(beNil());
 		expect(remoteRepo).notTo(beNil());
 		expect(@(remoteRepo.isBare)).to(beTruthy()); // that's better
@@ -42,6 +44,9 @@
 		NSURL *localRepoURL = [remoteRepoFileURL.URLByDeletingLastPathComponent URLByAppendingPathComponent:@"localpushrepo"];
 		expect(localRepoURL).notTo(beNil());
 
+		// Ensure repo destination is clear before clone
+		[NSFileManager.defaultManager removeItemAtURL:localRepoURL error:NULL];
+
 		// Local clone for testing pushes
 		localRepo = [GTRepository cloneFromURL:remoteRepoFileURL toWorkingDirectory:localRepoURL options:nil error:&error transferProgressBlock:NULL checkoutProgressBlock:NULL];
 
@@ -56,26 +61,78 @@
 
 		remote = configuration.remotes[0];
 		expect(remote.name).to(equal(@"origin"));
+
+		// TODO: Verify tracking between local and remote branches
+		NSArray *branches = [localRepo allBranchesWithError:&error];
+		expect(error).to(beNil());
+		expect(branches).notTo(beNil());
+
+		masterBranch = branches[0];
+		expect(masterBranch.shortName).to(equal(@"master"));
 	});
 
 	afterEach(^{
+		[NSFileManager.defaultManager removeItemAtURL:notBareRepoURL error:NULL];
 		[NSFileManager.defaultManager removeItemAtURL:remoteRepoFileURL error:NULL];
 		[NSFileManager.defaultManager removeItemAtURL:localRepoURL error:NULL];
 	});
 
+	// Helper to quickly create commits
+	GTCommit *(^createCommitInRepository)(NSString *, NSData *, NSString *, GTRepository *) = ^(NSString *message, NSData *fileData, NSString *fileName, GTRepository *repo) {
+		GTTreeBuilder *treeBuilder = [[GTTreeBuilder alloc] initWithTree:nil error:nil];
+		[treeBuilder addEntryWithData:fileData fileName:fileName fileMode:GTFileModeBlob error:nil];
+
+		GTTree *testTree = [treeBuilder writeTreeToRepository:repo error:nil];
+
+		// We need the parent commit to make the new one
+		GTReference *headReference = [repo headReferenceWithError:nil];
+
+		GTEnumerator *commitEnum = [[GTEnumerator alloc] initWithRepository:repo error:nil];
+		[commitEnum pushSHA:[headReference targetSHA] error:nil];
+		GTCommit *parent = [commitEnum nextObject];
+
+		GTCommit *testCommit = [repo createCommitWithTree:testTree message:message parents:@[parent] updatingReferenceNamed:headReference.name error:nil];
+		expect(testCommit).notTo(beNil());
+
+		return testCommit;
+	};
+
 	describe(@"-pushBranch:toRemote:withOptions:error:progress:", ^{
 		it(@"pushes nothing when the branch on local and remote are in sync", ^{
 			NSError *error = nil;
-			NSArray *branches = [localRepo allBranchesWithError:&error];
+
+			BOOL result = [localRepo pushBranch:masterBranch toRemote:remote withOptions:nil error:&error progress:NULL];
 			expect(error).to(beNil());
-			expect(branches).notTo(beNil());
+			expect(@(result)).to(beTruthy());
+		});
+
+		it(@"pushes a new local commit to the remote", ^{
+			NSError *error = nil;
 
-			GTBranch *branch = branches[0];
-			expect(branch.shortName).to(equal(@"master"));
+			// Create a new commit in the master repo
+			NSString *testData = @"Test";
+			NSString *fileName = @"test.txt";
+			GTCommit *testCommit = createCommitInRepository(@"Test commit", [testData dataUsingEncoding:NSUTF8StringEncoding], fileName, localRepo);
+			expect(testCommit).notTo(beNil());
 
-			BOOL result = [localRepo pushBranch:branch toRemote:remote withOptions:nil error:&error progress:NULL];
+			// Push
+			BOOL result = [localRepo pushBranch:masterBranch toRemote:remote withOptions:nil error:&error progress:NULL];
 			expect(error).to(beNil());
 			expect(@(result)).to(beTruthy());
+
+			// Verify commit is in remote
+			GTCommit *pushedCommit = [remoteRepo lookUpObjectByOID:testCommit.OID objectType:GTObjectTypeCommit error:&error];
+			expect(error).to(beNil());
+			expect(pushedCommit).notTo(beNil());
+			expect(pushedCommit.OID).to(equal(testCommit.OID));
+
+			GTTreeEntry *entry = [[pushedCommit tree] entryWithName:fileName];
+			expect(entry).notTo(beNil());
+
+			GTBlob *fileData = (GTBlob *)[entry GTObject:&error];
+			expect(error).to(beNil());
+			expect(fileData).notTo(beNil());
+			expect(fileData.content).to(equal(testData));
 		});
 	});