refactor: merge test and rspec

planio-gmbh · Jan 30, 2023 · 6f5965d · 6f5965d
1 parent 4fc9d3d
commit 6f5965d
Showing 1 changed file with 1 addition and 37 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -57,34 +57,9 @@ jobs:
       - redmine-plugin/install-self
       - redmine-plugin/generate-database_yml
       - redmine-plugin/bundle-install
+      - redmine-plugin/rspec
       - redmine-plugin/migrate-without-plugins
       - plugin-test/run-tests
-  rspec:
-    parameters:
-      redmine_version:
-        type: string
-      ruby_version:
-        type: string
-        default: '2.7'
-      db:
-        type: enum
-        enum: ['mysql', 'pg']
-        default: pg
-      db_version:
-        type: string
-        default: 'latest-ram'
-    executor:
-      name: redmine-plugin/ruby-<< parameters.db >>
-      ruby_version: << parameters.ruby_version >>
-      db_version: << parameters.db_version >>
-    steps:
-      - checkout
-      - redmine-plugin/download-redmine:
-          version: << parameters.redmine_version >>
-      - redmine-plugin/install-self
-      - redmine-plugin/generate-database_yml
-      - redmine-plugin/bundle-install
-      - redmine-plugin/rspec
 workflows:
   run-tests-workflow:
     jobs:
@@ -98,14 +73,3 @@ workflows:
             database: mysql
             ruby_version: '2.6'
             redmine_version: '4.2.9'
-        - rspec:
-            name: RSpec on newest versions with PostgreSQL
-            redmine_version: latest
-            ruby_version: '2.7'
-            db: pg
-        - rspec:
-            name: RSpec on oldest versions with MySQL
-            redmine_version: '4.0.9'
-            ruby_version: '2.6'
-            db: mysql
-            db_version: '5.7-ram'