Skip to content

Commit

Permalink
Merge branch 'main' into feature_add_the_ability_to_clear_file_input
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul-Bob authored Nov 1, 2024
2 parents 014111a + 9dccf2a commit 99cb063
Show file tree
Hide file tree
Showing 208 changed files with 3,371 additions and 1,903 deletions.
2 changes: 2 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ categories:
labels:
- 'Feature'
- 'Feat'
- title: '✨ Enhancements'
labels:
- 'Enhancement'
- title: '🐛 Bug Fixes'
labels:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/feature-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand All @@ -62,7 +62,7 @@ jobs:
bundler: default
ruby-version: ${{ matrix.ruby }}

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: vendor/bundle
key: ${{ runner.os }}-test-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand All @@ -78,9 +78,9 @@ jobs:
- name: Get yarn cache directory path
id: test-yarn-cache-dir-path
run: echo "name=dir::$(yarn cache dir)" >> $GITHUB_OUTPUT
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
- uses: actions/cache@v4
id: test-yarn-cache
with:
path: ${{ steps.test-yarn-cache-dir-path.outputs.dir }}
Expand Down Expand Up @@ -109,12 +109,12 @@ jobs:
id: run_tests
run: bundle exec rspec spec/features

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: coverage_features_${{ matrix.rails }}_ruby_${{ matrix.ruby }}
path: coverage/.resultset.json

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always() && steps.run_tests.outcome == 'failure'
with:
name: rspec_failed_screenshots_rails_${{ matrix.rails }}_ruby_${{ matrix.ruby }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/i18n-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand All @@ -59,7 +59,7 @@ jobs:
bundler: default
ruby-version: ${{ matrix.ruby }}

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: vendor/bundle
key: ${{ runner.os }}-test-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand All @@ -75,9 +75,9 @@ jobs:
- name: Get yarn cache directory path
id: test-yarn-cache-dir-path
run: echo "name=dir::$(yarn cache dir)" >> $GITHUB_OUTPUT
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
- uses: actions/cache@v4
id: test-yarn-cache
with:
path: ${{ steps.test-yarn-cache-dir-path.outputs.dir }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/system-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand All @@ -61,7 +61,7 @@ jobs:
bundler: default
ruby-version: ${{ matrix.ruby }}

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: vendor/bundle
key: ${{ runner.os }}-test-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand All @@ -77,9 +77,9 @@ jobs:
- name: Get yarn cache directory path
id: test-yarn-cache-dir-path
run: echo "name=dir::$(yarn cache dir)" >> $GITHUB_OUTPUT
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
- uses: actions/cache@v4
id: test-yarn-cache
with:
path: ${{ steps.test-yarn-cache-dir-path.outputs.dir }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-tailwindcss-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
repository: avo-hq/avo_tailwindcss_test_repo

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: vendor/bundle
key: ${{ runner.os }}-test-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.MD
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Please fork Avo and create a descriptive branch for your feature or fix. We usua
Thank you for considering to contribute to Avo. These are our recommendations to improve readability and interoperability when contributing with a PR:

- the title should have the type (`feature`, `chore`, `fix`, `refactor`) followed by the sentence case of what it does (ex: `feature: scoped search for has many associations` or `fix: broken sidebar on desktop`).
- the PR should be marked by the appropiate tag (`feature`, `chore`, `fix`, `refactor`)
- the PR should be marked by the appropriate tag (`feature`, `chore`, `fix`, `refactor`)
- if there's an issue open that could be fixed by this PR you can mark it by writing `Fixes ISSUE_URL` in the description so GitHub automates some actions (ex: `Fixes https://github.com/avo-hq/avo/issues/1008`). If there are more issues that could be fixed, add more lines.
- please follow the steps on the `Checklist` and mark them as done with an `x` inside the brackets `[x]`
- if there's something that we can test, please send us the instructions to do that in that PR description.
Expand Down Expand Up @@ -167,7 +167,7 @@ In order to restore the previous fields you may run `RESOURCE_CLASS.restore_item

### Working with datepickers

The prerequisite for these helpers is to ensure you have the two inputs mapped in your test file like so and you update the `FIELD_ID` attribute to the field you decalred on your resource `created_at`, `starting_at`, etc.
The prerequisite for these helpers is to ensure you have the two inputs mapped in your test file like so and you update the `FIELD_ID` attribute to the field you declared on your resource `created_at`, `starting_at`, etc.

```ruby
subject(:text_input) { find '[data-field-id="FIELD_ID"] [data-controller="date-field"] input[type="text"]' }
Expand Down
28 changes: 17 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ gem "dotenv-rails"
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem "web-console", ">= 3.3.0"
gem "listen", ">= 3.5.1"
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem "spring"

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]

Expand All @@ -58,7 +57,7 @@ gem "devise"
#

group :development do
gem "standard"
gem "standard", require: false

# Release helper
gem "bump", require: false
Expand All @@ -77,12 +76,18 @@ group :development do

gem "hotwire-livereload", "~> 1.3.0"

gem "rubocop"
gem "ripper-tags"
gem "rubocop", require: false
gem "ripper-tags", require: false
gem "rubocop-shopify", require: false
gem "rubycritic", require: false

gem "actual_db_schema"

gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2"

# Keep version look on <4 until this PR gets merged and released
# https://github.com/zombocom/derailed_benchmarks/pull/239
gem "ruby-statistics", "< 4"
end

group :test do
Expand All @@ -96,6 +101,7 @@ group :test do
gem "simplecov-cobertura"
gem "simplecov-lcov"
gem "webmock"
gem "spring"
gem "spring-commands-rspec"
gem "launchy", require: false

Expand All @@ -108,15 +114,15 @@ gem "amazing_print"
group :development, :test do
gem "faker", require: false
gem "i18n-tasks", "~> 1.0.12"
gem "erb-formatter"
gem "erb-formatter", require: false
# https://thoughtbot.com/blog/a-standard-way-to-lint-your-views
gem "erb_lint"
gem "solargraph"
gem "solargraph-rails"
gem "erb_lint", require: false
gem "solargraph", require: false
gem "solargraph-rails", require: false

gem "factory_bot_rails"

gem "appraisal"
gem "appraisal", require: false
end

gem "zeitwerk"
Expand Down Expand Up @@ -153,7 +159,7 @@ gem "bundler-integrity", "~> 1.0"
# Avo country field requires this gem
gem "countries"

# Avo dashbaords requires this gem
# Avo dashboards requires this gem
gem "chartkick"

# Required by Avo
Expand Down
Loading

0 comments on commit 99cb063

Please sign in to comment.