additional test

bazel-contrib · Jan 30, 2024 · fc6954c · fc6954c
1 parent 0fc0c67
commit fc6954c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/e2e/__snapshots__/e2e.spec.ts.snap b/e2e/__snapshots__/e2e.spec.ts.snap
@@ -170,7 +170,7 @@ modules/unversioned/1.0.0/MODULE.bazel
 ----------------------------------------------------
 module(
     name = \\"unversioned\\",
-  version = \\"1.0.0\\"
+  version = \\"1.0.0\\",
 )
 
 ----------------------------------------------------
@@ -183,7 +183,7 @@ modules/unversioned/1.0.0/patches/module_dot_bazel_version.patch
  module(
 -    name = \\"unversioned\\"
 +    name = \\"unversioned\\",
-+  version = \\"1.0.0\\"
++  version = \\"1.0.0\\",
  )
 
 ----------------------------------------------------
@@ -208,7 +208,7 @@ modules/unversioned/1.0.0/source.json
     \\"strip_prefix\\": \\"unversioned-1.0.0\\",
     \\"url\\": \\"https://github.com/testorg/unversioned/archive/refs/tags/v1.0.0.tar.gz\\",
     \\"patches\\": {
-        \\"module_dot_bazel_version.patch\\": \\"sha256-CahdP4+xcGJVM9GyA0Sg2rUe5rIPHzKJ6J4SfFTm2x8=\\"
+        \\"module_dot_bazel_version.patch\\": \\"sha256-LGXyh9FLhgIPbe0gHfxAPnEQ7HVR+HUP/IDbPdl3ZkA=\\"
     },
     \\"patch_strip\\": 1
 }

diff --git a/src/domain/module-file.spec.ts b/src/domain/module-file.spec.ts
@@ -80,7 +80,24 @@ module(
     expect(moduleFile.content).toEqual(`\
 module(
   name = "rules_foo",
-  version = "4.5.6"
+  version = "4.5.6",
+)`);
+  });
+
+  test("stamps the version when the version field was originally missing and the last field is comma-trailed", () => {
+    mocked(fs.readFileSync).mockReturnValue(`\
+module(
+  name = "rules_foo",
+  compatibility_level = 1,
+)`);
+    const moduleFile = new ModuleFile("MODULE.bazel");
+    moduleFile.stampVersion("4.5.6");
+
+    expect(moduleFile.content).toEqual(`\
+module(
+  name = "rules_foo",
+  compatibility_level = 1,
+  version = "4.5.6",
 )`);
   });
 });

diff --git a/src/domain/module-file.ts b/src/domain/module-file.ts
@@ -41,8 +41,8 @@ export class ModuleFile {
     } else {
       // add the version
       this.moduleContent = this.moduleContent.replace(
-        /(^.*?module\(.*?)(\s*)\)/s,
-        `$1,\n  version = "${version}"\n)`
+        /(^.*?module\(.*?),?(\s*)\)/s,
+        `$1,\n  version = "${version}",\n)`
       );
     }
   }