Skip to content

Commit 72c903c

Browse files
committed
Merge branch 'develop' into sf/es5-javascript
2 parents 183ce15 + 2337d87 commit 72c903c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1310
-463
lines changed

.circleci/config.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

.github/workflows/dockerpush.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: specs
2+
3+
on: [push]
4+
5+
jobs:
6+
test:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@v2
11+
12+
- name: Run tests
13+
run: |
14+
docker-compose run --rm test bundle exec rake db:schema:load
15+
docker-compose run --rm test bundle exec rspec spec/usage

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.6.1

Dockerfile.dev

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM ruby:2.6.5-alpine3.9
2+
3+
RUN gem install bundler:2.1.4
4+
5+
RUN apk update --no-cache && \
6+
apk add build-base git nodejs yarn tzdata bash sqlite-dev && \
7+
mkdir -p /app
8+
9+
WORKDIR /app
10+
11+
COPY ./lib/ /app/lib/
12+
COPY matestack-ui-core.gemspec /app/
13+
COPY Gemfile* /app/
14+
RUN bundle install
15+
16+
COPY package.json yarn* /app/
17+
RUN yarn install

Dockerfile.test

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
FROM ruby:2.6.5-alpine3.9
2+
3+
RUN gem install bundler:2.1.4
4+
5+
RUN apk update --no-cache && \
6+
apk add build-base git nodejs yarn tzdata bash sqlite-dev && \
7+
mkdir -p /app
8+
9+
WORKDIR /app
10+
11+
COPY ./lib/ /app/lib/
12+
COPY matestack-ui-core.gemspec /app/
13+
COPY Gemfile* /app/
14+
RUN bundle install
15+
16+
COPY package.json yarn* /app/
17+
RUN yarn install
18+
19+
RUN apk update && apk upgrade \
20+
&& echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
21+
&& echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
22+
&& apk add --no-cache \
23+
chromium@edge=72.0.3626.121-r0 \
24+
nss@edge \
25+
&& rm -rf /var/lib/apt/lists/* \
26+
/var/cache/apk/* \
27+
/usr/share/man \
28+
/tmp/*
29+
30+
RUN apk add chromium-chromedriver@edge=72.0.3626.121-r0
31+
32+
ENV CHROME_BIN=/usr/bin/chromium-browser \
33+
CHROME_PATH=/usr/lib/chromium/

Gemfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,18 @@ group :development, :test do
2222
gem 'capybara'
2323
gem 'webpacker', '~> 4.0'
2424
gem 'sqlite3', '~> 1.3.13'
25-
gem 'selenium-webdriver'
25+
gem 'selenium-webdriver', '~> 3.142', '>= 3.142.7'
2626
gem 'puma'
2727
gem 'simplecov', require: false, group: :test
2828
gem 'byebug'
2929
gem 'pry-byebug'
3030
gem 'webmock'
31-
gem 'webdrivers', '~> 4.1'
31+
gem 'pry-rails'
32+
gem 'pry-byebug'
3233
end
3334

3435
group :test do
3536
gem "generator_spec"
37+
gem "rspec-retry" # repeating flaky tests
38+
gem "rspec-wait", "~> 0.0.9"
3639
end

0 commit comments

Comments
 (0)