Merge pull request #8 from solidusio-contrib/circleci

Adopt CircleCI instead of Travis

.circleci/config.yml

@@ -0,0 +1,35 @@
+version: 2.1
+
+orbs:
+  # Always take the latest version of the orb, this allows us to
+  # run specs against Solidus supported versions only without the need
+  # to change this configuration every time a Solidus version is released
+  # or goes EOL.
+  solidusio_extensions: solidusio/extensions@volatile
+
+jobs:
+  run-specs-with-postgres:
+    executor: solidusio_extensions/postgres
+    steps:
+      - solidusio_extensions/run-tests
+  run-specs-with-mysql:
+    executor: solidusio_extensions/mysql
+    steps:
+      - solidusio_extensions/run-tests
+
+workflows:
+  "Run specs on supported Solidus versions":
+    jobs:
+      - run-specs-with-postgres
+      - run-specs-with-mysql
+  "Weekly run specs against master":
+    triggers:
+      - schedule:
+          cron: "0 0 * * 4" # every Thursday
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - run-specs-with-postgres
+      - run-specs-with-mysql

Gemfile

@@ -3,17 +3,24 @@ source 'https://rubygems.org'
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 
-if branch == 'master' || branch >= 'v2.0'
+if branch == 'master' || Gem::Version.new(branch[1..-1]) >= Gem::Version.new('2.0.0')
   gem 'rails-controller-testing', group: :test
 else
   gem 'rails_test_params_backport', group: :test
 end
 
-gem 'pg', '~> 0.21'
-gem 'mysql2', '~> 0.4.10'
+# Needed to help Bundler figure out how to resolve dependencies, otherwise it takes forever to
+# resolve them
+if branch == 'master' || Gem::Version.new(branch[1..-1]) >= Gem::Version.new('2.10.0')
+  gem 'rails', '~> 6.0'
+else
+  gem 'rails', '~> 5.0'
+end
 
-group :development, :test do
-  gem 'pry-rails'
+if ENV['DB'] == 'mysql'
+  gem 'mysql2'
+else
+  gem 'pg'
 end
 
 gemspec

README.md

@@ -1,6 +1,7 @@
 SolidusReports
 ==============
-[![Build Status](https://travis-ci.org/solidusio-contrib/solidus_reports.svg?branch=master)](https://travis-ci.org/solidusio-contrib/solidus_reports)
+
+[![CircleCI](https://circleci.com/gh/solidusio-contrib/solidus_reports.svg?style=svg)](https://circleci.com/gh/solidusio-contrib/solidus_reports)
 
 This extension add the reports module to Solidus Admin. The reports section was extracted into this extension.
 

lib/solidus_reports.rb

@@ -1,2 +1,3 @@
 require 'solidus_core'
+require 'solidus_reports/version'
 require 'solidus_reports/engine'

lib/solidus_reports/engine.rb

@@ -9,8 +9,6 @@ class Engine < Rails::Engine
       g.test_framework :rspec
     end
 
-    config.autoload_paths += %W(#{config.root}/lib)
-
     initializer 'solidus_simple_dash.environment', before: :load_config_initializers do
       SolidusReports::Config = SolidusReports::Configuration.new
     end

solidus_reports.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'factory_bot'
-  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rspec-rails', '~> 4.0.0.beta2'
   s.add_development_dependency 'rspec-activemodel-mocks'
   s.add_development_dependency 'rubocop', '0.49.0'
   s.add_development_dependency 'rubocop-rspec', '1.4.0'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3', '~> 1.3.6'
+  s.add_development_dependency 'sqlite3'
 end