Merge pull request #347 from platanus/circle-ci-config2

Setup Circle CI

Author: ldlsegovia

.circleci/config.yml

@@ -0,0 +1,73 @@
+version: 2.1
+orbs:
+  ruby: circleci/[email protected]
+  browser-tools: circleci/[email protected]
+jobs:
+  test:
+    parameters:
+      ruby-version:
+        type: string
+    docker:
+      - image: circleci/ruby:<< parameters.ruby-version >>-node
+        environment:
+          RAILS_ENV: test
+          NODE_ENV: test
+          BUNDLE_PATH: vendor/bundle
+          SPROCKETS: false
+    executor: ruby/default
+    steps:
+      - checkout
+      - browser-tools/install-chrome
+      - browser-tools/install-chromedriver
+      - restore_cache:
+          keys:
+          - bundler-dependencies-{{ checksum "Gemfile.lock" }}
+          - bundler-dependencies-
+      - run:
+          name: Install bundle dependencies
+          command: |
+            BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")
+            gem install bundler:$BUNDLER_VERSION
+            bundle _$(echo $BUNDLER_VERSION)_ install
+      - save_cache:
+          key: bundler-dependencies-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+      - run:
+          name: Setup database
+          command: (cd spec/dummy && bundle exec rake db:setup)
+      - run:
+          name: Prepare Assets
+          command: |
+            bundle exec rake prepare_assets
+            (cd spec/dummy && bundle exec rake webpacker:compile)
+      - run:
+          name: Utils Tests
+          command: |
+            RSPEC_JUNIT_ARGS="-r rspec_junit_formatter -f RspecJunitFormatter -o test_results/utils-rspec.xml"
+            RSPEC_FORMAT_ARGS="-f progress --no-color -p 10"
+            bundle exec rspec ./spec/lib $RSPEC_FORMAT_ARGS $RSPEC_JUNIT_ARGS
+      - run:
+          name: Run Webpack Tests
+          command: |
+            RSPEC_JUNIT_ARGS="-r rspec_junit_formatter -f RspecJunitFormatter -o test_results/webpack-rspec.xml"
+            RSPEC_FORMAT_ARGS="-f progress --no-color -p 10"
+            export SPROCKETS=false
+            bundle exec rspec ./spec/features $RSPEC_FORMAT_ARGS $RSPEC_JUNIT_ARGS
+      - run:
+          name: Run Sprockets Tests
+          command: |
+            RSPEC_JUNIT_ARGS="-r rspec_junit_formatter -f RspecJunitFormatter -o test_results/sprockets-rspec.xml"
+            RSPEC_FORMAT_ARGS="-f progress --no-color -p 10"
+            export SPROCKETS=true
+            bundle exec rspec ./spec/features $RSPEC_FORMAT_ARGS $RSPEC_JUNIT_ARGS
+      - store_test_results:
+          path: test_results
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test:
+          matrix:
+            parameters:
+              ruby-version: ["2.5", "2.6", "2.7"]

.travis.yml

@@ -266,6 +266,8 @@ GEM
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (0.65.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -345,6 +347,7 @@ DEPENDENCIES
   puma
   rails (~> 5.2, >= 5.2.4.1)
   rspec-rails
+  rspec_junit_formatter
   rubocop (~> 0.65.0)
   shoulda-matchers
   sqlite3

Gemfile.lock

@@ -1,6 +1,5 @@
 # ActiveAdmin Addons
 [![Gem Version](https://badge.fury.io/rb/activeadmin_addons.svg)](https://badge.fury.io/rb/activeadmin_addons)
-[![Build Status](https://secure.travis-ci.org/platanus/activeadmin_addons.svg?branch=master)](http://travis-ci.org/platanus/activeadmin_addons)
 
 ActiveAdmin Addons will extend your ActiveAdmin and enable a set of addons you can optionally use to improve the ActiveAdmin UI and make it awesome.
 

README.md

@@ -14,22 +14,36 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+task :prepare_assets do
+  system "rm -rf spec/dummy/public/packs"
+  system "rm -rf spec/dummy/public/packs-test"
+  system "yarn install"
+  system "yarn build"
+  system "yarn prepublishOnly"
+  system "(cd spec/dummy && yarn install)"
+  system "rm -rf spec/dummy/node_modules/activeadmin_addons/spec"
+  system "rm -rf spec/dummy/node_modules/activeadmin_addons/vendor"
+end
+
 task :tests do
   system "rspec ./spec/lib"
 end
 
 task :sprockets_tests do
-  system "export SPROCKETS=true; yarn build; rspec ./spec/features"
+  system "rake prepare_assets"
+  system "export SPROCKETS=true; rspec ./spec/features"
 end
 
 task :webpack_tests do
+  system "rake prepare_assets"
   system "export SPROCKETS=false; rspec ./spec/features"
 end
 
 task :all_tests do
+  system "rake prepare_assets"
   system "rake tests"
-  system "rake sprockets_tests"
-  system "rake webpack_tests"
+  system "export SPROCKETS=true; rspec ./spec/features"
+  system "export SPROCKETS=false; rspec ./spec/features"
 end
 
 Bundler::GemHelper.install_tasks

Rakefile

@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "puma"
   s.add_development_dependency "rails", "~> 5.2", ">= 5.2.4.1"
   s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "rspec_junit_formatter"
   s.add_development_dependency "rubocop", "~> 0.65.0"
   s.add_development_dependency "shoulda-matchers"
   s.add_development_dependency "sqlite3"

activeadmin_addons.gemspec

@@ -3,10 +3,10 @@
 # Exit if any subcommand fails
 set -e
 
-# Set up Ruby dependencies via Bundler
+rm -rf node_modules
+rm -rf spec/dummy/node_modules
+export SPROCKETS=false
 gem install bundler --conservative
 bundle check || bundle install
-
-cd spec/dummy
-bundle exec rake db:setup
-
+bundle exec rake prepare_assets
+(cd spec/dummy && bundle exec rake db:setup)

bin/setup

@@ -19,18 +19,32 @@ bin/setup
 ```
 
 This command loads the dummy app with test data.
-To navigate the application you can run, inside the `/spec/dummy` directory:
+To navigate the application you can run, inside the `/spec/dummy` directory...
+
+**With webpack:**
 
 ```
 bin/rails s
 ```
 
-If you are using webpacker, it can be useful to run:
+And in another tab:
 
 ```
 bin/webpack-dev-server
 ```
 
+**With Sprockets:**
+
+```
+export SPROCKETS=true; bin/rails s
+```
+
+And if you change the javascript, you will need to run the following command:
+
+```
+bundle exec rake prepare_assets
+```
+
 > It is a good idea to add to the dummy app any new functionality. See for example the file: `/spec/dummy/app/admin/invoices.rb`
 
 ## Testing