From fc8fc025103310d1c0e4ab3ee0a7e9ae826d685b Mon Sep 17 00:00:00 2001
From: Rogerio Angeliski <angeliski@hotmail.com>
Date: Wed, 15 Dec 2021 13:05:39 -0300
Subject: [PATCH] add more options to rails new

Signed-off-by: Rogerio Angeliski <angeliski@hotmail.com>
---
 .changeset/gentle-humans-hope.md                       |  5 +++++
 .../src/actions/fetch/rails/index.ts                   | 10 ++++++++++
 .../actions/fetch/rails/railsArgumentResolver.test.ts  |  2 ++
 .../src/actions/fetch/rails/railsArgumentResolver.ts   | 10 ++++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 .changeset/gentle-humans-hope.md

diff --git a/.changeset/gentle-humans-hope.md b/.changeset/gentle-humans-hope.md
new file mode 100644
index 0000000000..b8c337cec9
--- /dev/null
+++ b/.changeset/gentle-humans-hope.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-rails': patch
+---
+
+Add new options to rails new (force and skipTests)
diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts
index 00a5690c0a..56c45fa015 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts
@@ -96,6 +96,16 @@ export function createFetchRailsAction(options: {
                     description: "Don't run Webpack install",
                     type: 'boolean',
                   },
+                  skipTest: {
+                    title: 'skipTest',
+                    description: 'Skip test files',
+                    type: 'boolean',
+                  },
+                  force: {
+                    title: 'force',
+                    description: 'Overwrite files that already exist',
+                    type: 'boolean',
+                  },
                   api: {
                     title: 'api',
                     description: 'Preconfigure smaller stack for API only apps',
diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.test.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.test.ts
index 99a113f4f7..cced9f7ac2 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.test.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.test.ts
@@ -27,6 +27,8 @@ describe('railsArgumentResolver', () => {
       [{ api: true }, ['--api']],
       [{ skipBundle: true }, ['--skip-bundle']],
       [{ skipWebpackInstall: true }, ['--skip-webpack-install']],
+      [{ skipTest: true }, ['--skip-test']],
+      [{ force: true }, ['--force']],
       [{ webpacker: 'vue' }, ['--webpack', 'vue']],
       [{ database: 'postgresql' }, ['--database', 'postgresql']],
       [{ railsVersion: 'dev' }, ['--dev']],
diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.ts
index 60251a702d..4006ead630 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.ts
@@ -51,6 +51,8 @@ export type RailsRunOptions = {
   railsVersion?: RailsVersion;
   skipBundle?: boolean;
   skipWebpackInstall?: boolean;
+  skipTest?: boolean;
+  force?: boolean;
 };
 
 export const railsArgumentResolver = (
@@ -76,6 +78,14 @@ export const railsArgumentResolver = (
     argumentsToRun.push('--skip-webpack-install');
   }
 
+  if (options?.skipTest) {
+    argumentsToRun.push('--skip-test');
+  }
+
+  if (options?.force) {
+    argumentsToRun.push('--force');
+  }
+
   if (
     options?.webpacker &&
     Object.values(Webpacker).includes(options?.webpacker as Webpacker)