e2e: force push test

Signed-off-by: Victoria Dye <[email protected]>

Author: vdye

test/e2e/features/basic.feature

@@ -30,11 +30,13 @@ Feature: Basic bundle server usage
     Then I am up-to-date with 'main'
     Then my repo's bundles are up-to-date with 'main'
 
-  # Scenario: Bundle with a force-push
-  #   Given a remote repository with 10 commits to 'main'
-  #   Given the bundle server has been initialized with the local repo
-  #   Given I clone from the local repo with a bundle URI
-  #   Given another developer removes 2 commits and adds 4 commits to 'main'
-  #   Given the bundle server is updated for the local repo
-  #   When I fetch from the remote
-  #   Then I am up-to-date with 'main'
+  Scenario: A user can fetch force-pushed refs from the bundle server
+    Given a new remote repository with main branch 'main'
+    Given another user pushed 10 commits to 'main'
+    Given the bundle server has been initialized with the remote repo
+    Given I cloned from the remote repo with a bundle URI
+    Given another developer removed 2 commits and added 4 commits to 'main'
+    Given the bundle server was updated for the remote repo
+    When I fetch from the remote
+    Then I am up-to-date with 'main'
+    Then my repo's bundles are up-to-date with 'main'

test/e2e/features/step_definitions/repository.ts

@@ -11,25 +11,7 @@ import { Given, When, Then } from '@cucumber/cucumber'
  */
 
 Given('another user pushed {int} commits to {string}', async function(this: BundleServerWorld, commitNum: number, branch: string) {
-  if (this.remote && !this.remote.isLocal) {
-    throw new Error("Remote is not initialized or does not allow pushes")
-  }
-
-  const user = User.Another
-  if (!this.repoMap.has(user)) {
-    this.cloneRepositoryFor(user)
-    utils.assertStatus(0, this.getRepo(user).cloneResult)
-  }
-  const clonedRepo = this.getRepo(user)
-
-  // TODO: figure out a better way to check whether the repo is empty
-  if (clonedRepo.runGit("show").status != 0) {
-    // Repo is empty, so make sure we're on the right branch
-    clonedRepo.runGit("branch", "-m", branch)
-  } else {
-    clonedRepo.runGit("switch", branch)
-    clonedRepo.runGit("pull", "origin", branch)
-  }
+  const clonedRepo = this.getRepoAtBranch(User.Another, branch)
 
   for (let i = 0; i < commitNum; i++) {
     utils.assertStatus(0, clonedRepo.runShell(`echo ${randomBytes(16).toString('hex')} >README.md`))
@@ -39,6 +21,25 @@ Given('another user pushed {int} commits to {string}', async function(this: Bund
   utils.assertStatus(0, clonedRepo.runGit("push", "origin", branch))
 })
 
+Given('another developer removed {int} commits and added {int} commits to {string}',
+  async function(this: BundleServerWorld, removeCommits: number, addCommits: number, branch: string) {
+    const clonedRepo = this.getRepoAtBranch(User.Another, branch)
+
+    // First, reset
+    utils.assertStatus(0, clonedRepo.runGit("reset", "--hard", `HEAD~${removeCommits}`))
+
+    // Then, add new commits
+    for (let i = 0; i < addCommits; i++) {
+      utils.assertStatus(0, clonedRepo.runShell(`echo ${randomBytes(16).toString('hex')} >README.md`))
+      utils.assertStatus(0, clonedRepo.runGit("add", "README.md"))
+      utils.assertStatus(0, clonedRepo.runGit("commit", "-m", `test ${i+1}`))
+    }
+
+    // Finally, force push
+    utils.assertStatus(0, clonedRepo.runGit("push", "-f", "origin", branch))
+  }
+)
+
 Given('I cloned from the remote repo with a bundle URI', async function(this: BundleServerWorld) {
   const user = User.Me
   this.cloneRepositoryFor(user, this.bundleServer.bundleUri())

test/e2e/features/support/world.ts

@@ -1,7 +1,7 @@
 import { setWorldConstructor, World, IWorldOptions } from '@cucumber/cucumber'
 import { randomUUID } from 'crypto'
 import { RemoteRepo } from '../classes/remote'
-import { absPath } from './utils'
+import * as utils from './utils'
 import * as fs from 'fs'
 import * as path from 'path'
 import { ClonedRepository } from '../classes/repository'
@@ -35,12 +35,12 @@ export class BundleServerWorld extends World<BundleServerParameters> {
     this.repoMap = new Map<User, ClonedRepository>()
 
     // Set up the trash directory
-    this.trashDirectory = path.join(absPath(this.parameters.trashDirectoryBase), randomUUID())
+    this.trashDirectory = path.join(utils.absPath(this.parameters.trashDirectoryBase), randomUUID())
     fs.mkdirSync(this.trashDirectory, { recursive: true });
 
     // Set up the bundle server
-    this.bundleServer = new BundleServer(absPath(this.parameters.bundleServerCommand),
-                                         absPath(this.parameters.bundleWebServerCommand))
+    this.bundleServer = new BundleServer(utils.absPath(this.parameters.bundleServerCommand),
+                                         utils.absPath(this.parameters.bundleWebServerCommand))
   }
 
   cloneRepositoryFor(user: User, bundleUri?: string): void {
@@ -61,6 +61,30 @@ export class BundleServerWorld extends World<BundleServerParameters> {
     return repo
   }
 
+  getRepoAtBranch(user: User, branch: string): ClonedRepository {
+    if (this.remote && !this.remote.isLocal) {
+      throw new Error("Remote is not initialized or does not allow pushes")
+    }
+
+    if (!this.repoMap.has(user)) {
+      this.cloneRepositoryFor(user)
+      utils.assertStatus(0, this.getRepo(user).cloneResult)
+    }
+
+    const clonedRepo = this.getRepo(user)
+
+    // TODO: figure out a better way to check whether the repo is empty
+    if (clonedRepo.runGit("show").status != 0) {
+      // Repo is empty, so make sure we're on the right branch
+      utils.assertStatus(0, clonedRepo.runGit("branch", "-m", branch))
+    } else {
+      utils.assertStatus(0, clonedRepo.runGit("switch", branch))
+      utils.assertStatus(0, clonedRepo.runGit("pull", "origin", branch))
+    }
+
+    return clonedRepo
+  }
+
   cleanup(): void {
     this.bundleServer.cleanup()