Skip to content

Add integration test #750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 60 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
0f389e9
Clean up .gitignore of mentions of spec/integration
drwl Feb 1, 2020
4a1fdcb
Generate vanilla Rails 6.0.2.1 application
drwl Feb 1, 2020
6ff7afa
Add .keep for tmp/cache/assets/
drwl Feb 1, 2020
1951cee
Add .keep for Rails app
drwl Feb 1, 2020
d07af38
Add Rails boilerplate .gitignore
drwl Feb 1, 2020
c0c5684
Generate schema.rb
drwl Feb 1, 2020
55195f5
Generate Task model
drwl Feb 1, 2020
5a2e40e
Add default values to Task migration
drwl Feb 1, 2020
258630a
Run `rails db:migrate` and `rubocop --auto-gen-config`
drwl Feb 1, 2020
fb96187
Add local annotate gem
drwl Feb 1, 2020
da833f7
Add resources routes for Task
drwl Feb 1, 2020
03be988
Remove Integration test code from spec_helper.rb
drwl Feb 1, 2020
c20ed61
WIP
drwl Feb 1, 2020
b463594
Add bundle install
drwl Feb 3, 2020
d2ec900
Run `bundle update`
drwl Feb 3, 2020
7d6e8fb
Stay on Bundler 1.17.3 for TravisCI
drwl Feb 3, 2020
9ffad7d
Bump Rails app bundler version
drwl Feb 3, 2020
4923b92
Revert "Stay on Bundler 1.17.3 for TravisCI"
drwl Feb 3, 2020
756ca77
Output when running annotate models command
drwl Feb 3, 2020
99f278a
Ignore Gemfile.lock for Rails app
drwl Feb 3, 2020
b888270
Add Gemfile.lock ignore
drwl Feb 3, 2020
000a270
Remove ignored files
drwl Feb 3, 2020
6d81735
Add extra bundle install step in Github CI
drwl Feb 3, 2020
b69c94e
Make bundler update quiet and separate actions
drwl Feb 3, 2020
e274fb8
Remove rails version
drwl Feb 3, 2020
c93a5bd
Add ruby version
drwl Feb 3, 2020
4f87e21
Make some changes
drwl Feb 3, 2020
63b75e5
Add sqlite install to Github CI
drwl Feb 3, 2020
06830a8
Remove bundle install
drwl Feb 3, 2020
377a766
Track sqlite db for Rails app
drwl Feb 3, 2020
d1068d8
Add sqlite3 to Travis CI
drwl Feb 3, 2020
4e52b0e
Try sqlite addon
drwl Feb 3, 2020
6f4f012
Use BUNDLE_GEMFILE env variable
drwl Feb 3, 2020
e5b09b5
Revert "Use BUNDLE_GEMFILE env variable"
drwl Feb 3, 2020
cda5f37
Try again
drwl Feb 3, 2020
a580cc7
Adding some puts
drwl Feb 3, 2020
2bc9bc1
Separate rubocop and spec
drwl Feb 3, 2020
946d757
Make it run
drwl Feb 3, 2020
bb4fa5e
Another
drwl Feb 3, 2020
2233587
more puts
drwl Feb 3, 2020
9e0efcc
puts ENV
drwl Feb 3, 2020
bc8a234
Set env variables in Travis CI
drwl Feb 3, 2020
271b4dc
make it same line
drwl Feb 3, 2020
b4d815f
Remove puts
drwl Feb 3, 2020
9237241
Use Bundler.with_original_env
drwl Feb 3, 2020
cb33366
Revert "Use Bundler.with_original_env"
drwl Feb 3, 2020
57f01b8
Add better spec description
drwl Feb 3, 2020
96bab4e
Use vanilla Rails app .gitignore
drwl Feb 3, 2020
b4c7b07
Update main .gitignore
drwl Feb 3, 2020
1a40290
Relax ruby constraints
drwl Feb 3, 2020
310540d
Add ruby versions to TravisCI
drwl Feb 3, 2020
9ccd9e5
Update ruby versions on Github CI
drwl Feb 3, 2020
cb81a4e
Disable fail-fast on Github CI
drwl Feb 3, 2020
ce2a943
Remove deprecated sudo key in Travis config
drwl Feb 4, 2020
acff215
Remove Ruby 2.4.X from CI
drwl Feb 4, 2020
a314588
Exclude Rails Apps from Rubocop
drwl Feb 4, 2020
a28a43b
Remove require 'pry' statement
drwl Feb 4, 2020
b7b6717
Add run migration command
drwl Feb 4, 2020
96a6ee1
Remove ignored files
drwl Feb 4, 2020
a0f2bc3
Run db:migrate in Bundle#with_clean_env
drwl Feb 4, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ jobs:
test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ruby: ['2.4.x', '2.5.x', '2.6.x']
ruby: ['2.5.x', '2.6.x']

steps:
- name: Checkout
Expand All @@ -24,11 +25,24 @@ jobs:
with:
ruby-version: ${{ matrix.ruby }}

- name: Bundle
- name: Install sqlite
run: |
gem update --system
gem update bundler
bundle install --jobs 4 --retry 3
sudo apt-get install libsqlite3-dev

- name: Test
run: bundle exec rubocop && bundle exec rspec
- name: Update System
run: |
gem update --system --no-document

- name: Bundle install for Annotate models
run: |
bundle install --jobs=4 --retry=3

- name: Bundle install for Rails app
run: |
bundle install --jobs=4 --retry=3 --gemfile=spec/integration/rails_6.0.2.1/Gemfile

- name: Run Tests
run: bundle exec rspec

- name: Rubocop
run: bundle exec rubocop
6 changes: 0 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
!/spec/integration/*/log/.gitkeep
!/spec/integration/*/tmp/.gitkeep
*.gem
.DS_Store
.bundle
Expand All @@ -16,8 +14,4 @@
/doc/*
/pkg/*
/spec/debug.log
/spec/integration/*/bin/
/spec/integration/*/db/test.*
/spec/integration/*/log/*
/spec/integration/*/tmp/*
.byebug_history
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ AllCops:
- 'vendor/**/*'
- 'spec/fixtures/**/*'
- 'tmp/**/*'
- 'spec/integration/**/*'

Metrics/BlockLength:
Exclude:
Expand Down
Loading