Merge pull request #368 from matestack/dockerized_core_dev

Dockerized core dev

Author: jonasjabari

.circleci/config.yml

@@ -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

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

.ruby-version

@@ -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

@@ -22,15 +22,17 @@ group :development, :test do
   gem 'capybara'
   gem 'webpacker', '~> 4.0'
   gem 'sqlite3', '~> 1.3.13'
-  gem 'selenium-webdriver'
+  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 'webdrivers', '~> 4.1'
 end
 
 group :test do
   gem "generator_spec"
+  gem "rspec-retry" # repeating flaky tests
+  gem "rspec-wait", "~> 0.0.9"
 end

Gemfile

@@ -54,18 +54,18 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     arel (9.0.0)
     builder (3.2.3)
     byebug (11.0.0)
-    capybara (3.10.0)
+    capybara (3.31.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
+      regexp_parser (~> 1.5)
       xpath (~> 3.2)
     cells (4.1.7)
       declarative-builder (< 0.2.0)
@@ -78,8 +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)
+    childprocess (3.0.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crack (0.4.3)
@@ -98,7 +97,6 @@ GEM
       uber (< 0.2.0)
     docile (1.3.2)
     erubi (1.8.0)
-    ffi (1.9.25)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
@@ -119,11 +117,11 @@ GEM
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
     mimemagic (0.3.3)
-    mini_mime (1.0.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     nio4r (2.5.2)
-    nokogiri (1.10.5)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     pipetree (0.1.1)
     pry (0.12.2)
@@ -132,10 +130,10 @@ GEM
     pry-byebug (3.8.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (3.0.3)
+    public_suffix (4.0.3)
     puma (4.3.1)
       nio4r (~> 2.0)
-    rack (2.0.8)
+    rack (2.1.2)
     rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
@@ -171,11 +169,15 @@ GEM
     reform-rails (0.1.7)
       activemodel (>= 3.2)
       reform (>= 2.2.0)
-    regexp_parser (1.2.0)
+    regexp_parser (1.6.0)
     representable (3.0.4)
       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)
@@ -192,12 +194,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.3.0)
+    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.18.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11.0)
@@ -232,10 +238,6 @@ 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)
@@ -263,13 +265,14 @@ DEPENDENCIES
   pry-byebug
   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 (~> 4.0)
 

Gemfile.lock

@@ -1,4 +1,4 @@
-[![CircleCI](https://circleci.com/gh/basemate/matestack-ui-core/tree/master.svg?style=shield)](https://circleci.com/gh/basemate/matestack-ui-core/tree/master)
+![](https://github.com/matestack/matestack-ui-core/workflows/specs/badge.svg)
 [![Gitter](https://badges.gitter.im/basemate/community.svg)](https://gitter.im/basemate/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Gem Version](https://badge.fury.io/rb/matestack-ui-core.svg)](https://badge.fury.io/rb/matestack-ui-core)
 

README.md

@@ -23,6 +23,8 @@ const componentDef = {
   }
 }
 
+
+
 let component = Vue.component('matestack-ui-core-app', componentDef)
 
 export default componentDef

app/concepts/matestack/ui/core/app/app.js

@@ -36,6 +36,16 @@ def method_missing meth, *args, &block
         @hash[current_node]["argument"] = nil
         @hash[current_node]["included_config"] = @included_config
 
+        if args.second == :include
+          included = args.first
+        else
+          unless @included_config.nil?
+            included = @included_config
+          else
+            included = nil
+          end
+        end
+
         if meth == :isolate
           raise("isolate > only works on page level currently. component support is comming soon!")
         end
@@ -52,15 +62,15 @@ def method_missing meth, *args, &block
             @hash[current_node]["argument"] = args.first
           end
 
-          if args.second == :include
-            included = args.first
-          else
-            unless @included_config.nil?
-              included = @included_config
-            else
-              included = nil
-            end
-          end
+          # if args.second == :include
+          #   included = args.first
+          # else
+          #   unless @included_config.nil?
+          #     included = @included_config
+          #   else
+          #     included = nil
+          #   end
+          # end
 
           if block_given?
             @hash[current_node]["components"] = ComponentNode.build(@component_instance, included, &block)