Skip to content
This repository was archived by the owner on Jul 15, 2025. It is now read-only.

Commit c6e7a26

Browse files
authored
Merge pull request #419 from uclibs/qa
Move QA to Main branch
2 parents 90a5ddf + 21edfc9 commit c6e7a26

251 files changed

Lines changed: 9117 additions & 3018 deletions

File tree

Some content is hidden

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

.browserslistrc

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

.circleci/config.yml

Lines changed: 50 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,32 @@
1-
# Ruby CircleCI 2.1 configuration file
1+
# Ruby CircleCI 2.0 configuration file
22
#
33
# Check https://circleci.com/docs/2.0/language-ruby/ for more details
44
#
55
version: 2.1
6+
executors:
7+
docker-publisher:
8+
environment:
9+
IMAGE_NAME: treatment-database-app
10+
docker:
11+
- image: docker:20.10.14-git
12+
13+
orbs:
14+
ruby: circleci/[email protected]
15+
node: circleci/[email protected]
16+
browser-tools: circleci/[email protected]
17+
coveralls: coveralls/[email protected]
18+
619
jobs:
720
build:
821
docker:
922
# specify the version you desire here
10-
- image: circleci/ruby:2.6.5-node-browsers
23+
- image: cimg/ruby:3.3.0
1124

1225
# Specify service dependencies here if necessary
1326
# CircleCI maintains a library of pre-built images
1427
# documented at https://circleci.com/docs/2.0/circleci-images/
1528
# - image: circleci/postgres:9.4
29+
1630
environment:
1731
BUNDLE_PATH: vendor/bundle
1832
BUNDLE_JOBS: 4
@@ -25,10 +39,14 @@ jobs:
2539
CACHE_PATH: /tmp/cache
2640
COVERALLS_PARALLEL: true
2741

42+
2843
working_directory: ~/aaec
2944

3045
steps:
3146
- checkout
47+
- node/install:
48+
node-version: "18.17.1"
49+
- browser-tools/install-browser-tools
3250

3351
- restore_cache:
3452
keys:
@@ -41,13 +59,15 @@ jobs:
4159
command: |
4260
echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
4361
source $BASH_ENV
44-
gem install bundler -v 2.0.1
62+
gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)"
63+
4564
- run:
4665
name: Install Dependencies
4766
command: |
48-
bundle install --jobs=4 --retry=3 --path vendor/bundle
67+
bundle install
4968
sudo apt-get update
50-
sudo apt-get install xvfb libfontconfig wkhtmltopdf
69+
sudo apt-get install xvfb libfontconfig
70+
5171
- save_cache:
5272
paths:
5373
- ./vendor/bundle
@@ -57,33 +77,40 @@ jobs:
5777
- run: bundle exec rake db:create
5878
- run: bundle exec rake db:schema:load
5979

80+
# Rubocop
6081
- run:
6182
name: Rubocop
6283
command: |
6384
gem install rubocop
6485
bundle exec rubocop
86+
87+
# Brakeman
88+
- run:
89+
name: Run Brakeman
90+
command: bundle exec brakeman -q -w 2
91+
92+
# Bundler-audit
93+
- run:
94+
name: Install Bundler-audit
95+
command: gem install bundler-audit
96+
- run:
97+
name: Run Bundle-audit
98+
command: bundle exec bundle audit check --update
99+
65100
# run tests!
66101
- run:
67102
name: Run rspec in parallel
68103
command: |
69104
mkdir /tmp/test-results
70105
bundle exec rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
71-
# collect reports
72-
- store_test_results:
73-
path: /tmp/test-results
74-
- store_artifacts:
75-
path: /tmp/test-results
76-
destination: test-results
77-
- store_artifacts:
78-
path: coverage
79-
80-
- deploy:
81-
name: Update Coveralls
82-
command: |
83-
curl -k https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN -d "payload[build_num]=$CIRCLE_BUILD_NUM&payload[status]=done"
106+
#bundle exec rspec --out /tmp/test-results/rspec.xml $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
107+
108+
- coveralls/upload:
109+
parallel_finished: true
110+
path_to_lcov: /home/circleci/aaec/coverage/lcov/aaec.lcov
111+
84112
workflows:
85-
version: 2
86-
ci:
87-
jobs:
88-
- build:
89-
name: ruby2-6-5
113+
version: 2
114+
ci:
115+
jobs:
116+
- build

.coveralls.yml

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

.dockerignore

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

.env.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ AAEC_PUBLICATION_YEAR_START="January 2020"
2020
AAEC_PUBLICATION_YEAR_END="December 2020"
2121

2222
# Expiration Date
23-
EXPIRATION_DATE="Jan 1 2099"
24-
PAST_DATE="Jan 2 2099"
23+
EXPIRATION_DATE="Jan 01 2099"
24+
PAST_DATE="Jan 02 2099"

.github/ISSUE_TEMPLATE.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
### Descriptive summary
2+
3+
Include a concise description of the issue and any relevant tracebacks if you're reporting a bug.
4+
5+
### Expected behavior
6+
7+
### Actual behavior
8+
9+
### Steps to reproduce the behavior
10+
11+
1. Do this
12+
1. Then do this...
13+
14+
### Related work
15+
16+
Link to related issues or prior related work here.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Fixes #issuenumber ; refs #issuenumber
2+
3+
Present short summary (50 characters or less)
4+
5+
More detailed description, if necessary. Try to be as descriptive as you can: even if you think that the PR content is obvious, it may not be obvious to others. Include tracebacks if helpful, and be sure to call out any bits of the PR that may be work-in-progress.
6+
7+
Description can have multiple paragraphs and you can use code examples inside:
8+
9+
``` ruby
10+
class PostsController
11+
def index
12+
respond_with Post.limit(10)
13+
end
14+
end
15+
```
16+
17+
Changes proposed in this pull request:
18+
*
19+
*
20+
*

.github/dependabot.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: 2
2+
updates:
3+
# "bundler" includes "rubygems"
4+
- package-ecosystem: "bundler"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"
8+
open-pull-requests-limit: 5
9+
- package-ecosystem: "github-actions"
10+
directory: "/"
11+
schedule:
12+
interval: "weekly"
13+
# "npm" includes "yarn" and "pnpm"
14+
- package-ecosystem: "npm"
15+
directory: "/"
16+
schedule:
17+
interval: "weekly"
18+
open-pull-requests-limit: 5

.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,17 @@
4646
.env.development.local
4747
.env.test.local
4848
.env.production.local
49+
50+
/public/packs
51+
/public/packs-test
52+
/node_modules
53+
/yarn-error.log
54+
yarn-debug.log*
55+
.yarn-integrity
56+
57+
# Ignore Vendor Local
58+
/vendor/bundle --local
59+
/vendor/bundle
60+
61+
# Ignore the files specific to VSCode
62+
.vscode/*

.rubocop_todo.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# This configuration was generated by
2+
# `rubocop --auto-gen-config`
3+
# on 2022-12-12 18:44:50 UTC using RuboCop version 1.40.0.
4+
# The point is for the user to remove these configuration records
5+
# one by one as the offenses are removed from the code base.
6+
# Note that changes in the inspected code, or installation of new
7+
# versions of RuboCop, may require this file to be generated again.

0 commit comments

Comments
 (0)