Merge branch 'develop' into sf/fix-form-reset-on-update-issue-304

Author: jonasjabari

.circleci/config.yml

@@ -1,18 +1,18 @@
-<!-- This is a template only, remove/add sections below as appropriate (e.g. for a new feature, there might be no 'current behaviour'.) -->
+<!-- This is a template only, remove/add sections below as appropriate (e.g. for a new feature, there might be no 'current behavior'.) -->
 
 <!-- First indicate whether you want to request an ENHANCEMENT or report a BUG by using the correct Github label in the side panel* -->
 
-**What is the current behaviour?**
+**What is the current behavior?**
 
-<!-- add current behaviour here -->
+<!-- add current behavior here -->
 
-**If the current behaviour is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem. Your bug might get fixed faster if we can run your code and it doesn't have extra dependencies. Add a link to a sample repo and/or any relevant code below:**
+**If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem. Your bug might get fixed faster if we can run your code and it doesn't have extra dependencies. Add a link to a sample repo and/or any relevant code below:**
 
 <!-- add additional links/info here -->
 
-**What is the expected behaviour?**
+**What is the expected behavior?**
 
-<!-- add expected behaviour here -->
+<!-- add expected behavior here -->
 
 **Which versions of Matestack, and which browser/OS are affected by this issue? Did this work in previous versions of Matestack?**
 

.github/issue_template.md

@@ -0,0 +1,15 @@
+name: specs
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Run tests
+        run: |
+          docker-compose run --rm test bundle exec rake db:schema:load
+          docker-compose run --rm test bundle exec rspec spec/usage

.github/workflows/dockerpush.yml

@@ -18,3 +18,5 @@ builder/storage/
 builder/tmp/
 builder/public/packs
 .idea/
+
+/coverage

.gitignore

@@ -0,0 +1 @@
+2.6.1

.ruby-version

@@ -53,7 +53,7 @@ none
 
 ### Bugfixes
 
-* Unexpected behaviour when creating a record in progress by jonasjabari
+* Unexpected behavior when creating a record in progress by jonasjabari
 * couldn't find file 'matestack_ui_core_manifest.js' on dummy app by jonasjabari
 * Add For Attribute to Stand Alone Label Component by bdlb77
 * Form component doesn't work on component-level by jonasjabari

CHANGELOG.md

@@ -0,0 +1,17 @@
+FROM ruby:2.6.5-alpine3.9
+
+RUN gem install bundler:2.1.4
+
+RUN apk update --no-cache && \
+    apk add build-base git nodejs yarn tzdata bash sqlite-dev && \
+    mkdir -p /app
+
+WORKDIR /app
+
+COPY ./lib/ /app/lib/
+COPY matestack-ui-core.gemspec /app/
+COPY Gemfile* /app/
+RUN bundle install
+
+COPY package.json yarn* /app/
+RUN yarn install

Dockerfile.dev

@@ -0,0 +1,33 @@
+FROM ruby:2.6.5-alpine3.9
+
+RUN gem install bundler:2.1.4
+
+RUN apk update --no-cache && \
+    apk add build-base git nodejs yarn tzdata bash sqlite-dev && \
+    mkdir -p /app
+
+WORKDIR /app
+
+COPY ./lib/ /app/lib/
+COPY matestack-ui-core.gemspec /app/
+COPY Gemfile* /app/
+RUN bundle install
+
+COPY package.json yarn* /app/
+RUN yarn install
+
+RUN apk update && apk upgrade \
+    && echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
+    && echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
+    && apk add --no-cache \
+    chromium@edge=72.0.3626.121-r0 \
+    nss@edge \
+    && rm -rf /var/lib/apt/lists/* \
+    /var/cache/apk/* \
+    /usr/share/man \
+    /tmp/*
+
+RUN apk add chromium-chromedriver@edge=72.0.3626.121-r0
+
+ENV CHROME_BIN=/usr/bin/chromium-browser \
+    CHROME_PATH=/usr/lib/chromium/

Dockerfile.test

@@ -11,10 +11,6 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
-# To use a debugger
-# gem 'byebug', group: [:development, :test]
-# gem 'pry-byebug', group: [:development, :test]
-
 gem "trailblazer"
 gem "trailblazer-rails"
 gem "trailblazer-cells"
@@ -24,19 +20,20 @@ gem "cells-haml"
 group :development, :test do
   gem 'rspec-rails', '~> 3.8'
   gem 'capybara'
-  gem 'webpacker', '~> 3.5'
+  gem 'webpacker', '~> 4.0'
   gem 'sqlite3', '~> 1.3.13'
-  gem 'selenium-webdriver'
-  gem 'poltergeist'
+  gem 'selenium-webdriver', '~> 3.142', '>= 3.142.7'
   gem 'puma'
   gem 'simplecov', require: false, group: :test
   gem 'byebug'
+  gem 'pry-byebug'
   gem 'webmock'
-  gem 'webdrivers', '~> 4.1'
   gem 'pry-rails'
   gem 'pry-byebug'
 end
 
 group :test do
   gem "generator_spec"
+  gem "rspec-retry" # repeating flaky tests
+  gem "rspec-wait", "~> 0.0.9"
 end

Gemfile

@@ -78,9 +78,7 @@ GEM
     cells-rails (0.0.9)
       actionpack (>= 3.0)
       cells (>= 4.1.6, < 5.0.0)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
-    cliver (0.3.2)
+    childprocess (3.0.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crack (0.4.3)
@@ -99,7 +97,6 @@ GEM
       uber (< 0.2.0)
     docile (1.3.1)
     erubi (1.8.0)
-    ffi (1.9.25)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
@@ -128,10 +125,6 @@ GEM
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     pipetree (0.1.1)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -183,6 +176,10 @@ GEM
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
     rspec-expectations (3.8.2)
@@ -199,12 +196,16 @@ GEM
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
+    rspec-retry (0.6.2)
+      rspec-core (> 3.3)
     rspec-support (3.8.0)
-    rubyzip (1.2.2)
+    rspec-wait (0.0.9)
+      rspec (>= 3, < 4)
+    rubyzip (2.2.0)
     safe_yaml (1.0.5)
-    selenium-webdriver (3.14.1)
-      childprocess (~> 0.5)
-      rubyzip (~> 1.2, >= 1.2.2)
+    selenium-webdriver (3.142.7)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -240,15 +241,11 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
-    webdrivers (4.1.2)
-      nokogiri (~> 1.6)
-      rubyzip (~> 1.0)
-      selenium-webdriver (>= 3.0, < 4.0)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpacker (3.5.5)
+    webpacker (4.2.2)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
@@ -268,20 +265,20 @@ DEPENDENCIES
   cells-rails
   generator_spec
   matestack-ui-core!
-  poltergeist
   pry-byebug
   pry-rails
   puma
   rspec-rails (~> 3.8)
-  selenium-webdriver
+  rspec-retry
+  rspec-wait (~> 0.0.9)
+  selenium-webdriver (~> 3.142, >= 3.142.7)
   simplecov
   sqlite3 (~> 1.3.13)
   trailblazer
   trailblazer-cells
   trailblazer-rails
-  webdrivers (~> 4.1)
   webmock
-  webpacker (~> 3.5)
+  webpacker (~> 4.0)
 
 BUNDLED WITH
    1.17.3