Merge branch '__rultor'

objectionary · Jun 6, 2024 · eba5e9f · eba5e9f
2 parents ef02f0e + 3bda3b3
commit eba5e9f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/mvnw.js b/src/mvnw.js
@@ -56,7 +56,7 @@ module.exports.flags = function(opts) {
   console.debug('Target in %s', rel(target));
   return [
     '-Deo.version=' + opts.parser,
-    '-Deo.tag=' + (opts.tag ? opts.tag : opts.parser),
+    '-Deo.tag=' + (opts.homeTag ? opts.homeTag : opts.parser),
     opts.verbose ? '--errors' : '',
     opts.verbose ? '' : '--quiet',
     opts.debug ? '--debug' : '',

diff --git a/test/test_mvnw.js b/test/test_mvnw.js
@@ -22,12 +22,26 @@
  * SOFTWARE.
  */
 
-const {mvnw} = require('../src/mvnw');
+const {mvnw, flags} = require('../src/mvnw');
+const assert = require('assert');
 
 describe('mvnw', function() {
   it('prints Maven own version', function(done) {
     const opts = {batch: true};
     mvnw(['--version', '--quiet'], null, opts.batch);
     done();
   });
+  it('sets right flags from options', function(done) {
+    const opts = {
+      sources: 'sources',
+      target: 'target',
+      parser: 'parser',
+      homeTag: 'homeTag'
+    };
+    mvnw(['--version', '--quiet', ...flags(opts)]).then((args) => {
+      assert.ok(args.includes('-Deo.tag=homeTag'));
+      assert.ok(args.includes('-Deo.version=parser'));
+      done();
+    });
+  });
 });