Skip to content

Commit 9e2e913

Browse files
authored
Merge pull request #71 from ViewComponent/ci
look at CI config
2 parents bc49b5a + 7de6846 commit 9e2e913

File tree

5 files changed

+6
-95
lines changed

5 files changed

+6
-95
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@ jobs:
1010
- name: Setup Ruby
1111
uses: ruby/setup-ruby@v1
1212
with:
13-
ruby-version: 3.0.0
13+
ruby-version: 3.0.3
1414
- uses: actions/cache@v2
1515
with:
1616
path: vendor/bundle
17-
key: gems-build-rails-6.1.0-ruby-3.0.0-${{ hashFiles('**/Gemfile.lock') }}
17+
key: gems-${{ hashFiles('**/Gemfile.lock') }}
1818
- name: Build and test with Rake
1919
run: |
2020
bundle config path vendor/bundle
2121
bundle update
2222
bundle exec rake
23-
env:
24-
RAILS_VERSION: 6.1.0

Gemfile

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,6 @@ gem "sassc-rails"
1515
gem "uglifier", ">= 1.3.0"
1616
# See https://github.com/rails/execjs#readme for more supported runtimes
1717
# gem 'mini_racer', platforms: :ruby
18-
19-
# Use CoffeeScript for .coffee assets and views
20-
gem "coffee-rails"
21-
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
22-
gem "turbolinks", "~> 5"
23-
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
24-
gem "jbuilder"
25-
# Use Redis adapter to run Action Cable in production
26-
# gem 'redis', '~> 4.0'
27-
# Use ActiveModel has_secure_password
28-
# gem 'bcrypt', '~> 3.1.7'
29-
30-
# Use ActiveStorage variant
31-
# gem 'mini_magick', '~> 4.8'
32-
33-
# Use Capistrano for deployment
34-
# gem 'capistrano-rails', group: :development
35-
3618
gem "octicons_helper"
3719

3820
gem "view_component"
@@ -42,22 +24,10 @@ gem "bootsnap", ">= 1.1.0"
4224

4325
gem "benchmark-ips"
4426

45-
gem "haml"
46-
gem "slim"
47-
4827
group :development, :test do
49-
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
50-
gem "byebug", platforms: [:mri, :mingw, :x64_mingw]
51-
end
52-
53-
group :development, :test do
54-
gem "capybara", ">= 2.15"
28+
gem "capybara", "~> 3"
5529
gem "factory_bot_rails"
56-
gem "pry-rails"
57-
gem "wkhtmltoimage-binary"
5830
end
5931

60-
gem "simplecov", require: false, group: :test
61-
6232
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
6333
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]

Gemfile.lock

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ GEM
7272
bootsnap (1.12.0)
7373
msgpack (~> 1.2)
7474
builder (3.2.4)
75-
byebug (11.1.3)
7675
capybara (3.37.1)
7776
addressable
7877
matrix
@@ -82,18 +81,9 @@ GEM
8281
rack-test (>= 0.6.3)
8382
regexp_parser (>= 1.5, < 3.0)
8483
xpath (~> 3.2)
85-
coderay (1.1.3)
86-
coffee-rails (5.0.0)
87-
coffee-script (>= 2.2.0)
88-
railties (>= 5.2.0)
89-
coffee-script (2.4.1)
90-
coffee-script-source
91-
execjs
92-
coffee-script-source (1.12.2)
9384
concurrent-ruby (1.1.10)
9485
crass (1.0.6)
9586
digest (3.1.0)
96-
docile (1.4.0)
9787
erubi (1.10.0)
9888
execjs (2.8.1)
9989
factory_bot (6.2.1)
@@ -104,14 +94,8 @@ GEM
10494
ffi (1.15.5)
10595
globalid (1.0.0)
10696
activesupport (>= 5.0)
107-
haml (5.2.2)
108-
temple (>= 0.8.0)
109-
tilt
11097
i18n (1.12.0)
11198
concurrent-ruby (~> 1.0)
112-
jbuilder (2.11.5)
113-
actionview (>= 5.0.0)
114-
activesupport (>= 5.0.0)
11599
loofah (2.18.0)
116100
crass (~> 1.0.2)
117101
nokogiri (>= 1.5.9)
@@ -148,11 +132,6 @@ GEM
148132
octicons (= 17.3.0)
149133
railties
150134
pg (1.4.2)
151-
pry (0.14.1)
152-
coderay (~> 1.1)
153-
method_source (~> 1.0)
154-
pry-rails (0.3.9)
155-
pry (>= 0.10.4)
156135
public_suffix (4.0.7)
157136
puma (4.3.12)
158137
nio4r (~> 2.0)
@@ -196,15 +175,6 @@ GEM
196175
sprockets (> 3.0)
197176
sprockets-rails
198177
tilt
199-
simplecov (0.21.2)
200-
docile (~> 1.1)
201-
simplecov-html (~> 0.11)
202-
simplecov_json_formatter (~> 0.1)
203-
simplecov-html (0.12.3)
204-
simplecov_json_formatter (0.1.4)
205-
slim (4.1.0)
206-
temple (>= 0.7.6, < 0.9)
207-
tilt (>= 2.0.6, < 2.1)
208178
sprockets (4.1.1)
209179
concurrent-ruby (~> 1.0)
210180
rack (> 1, < 3)
@@ -213,13 +183,9 @@ GEM
213183
activesupport (>= 5.2)
214184
sprockets (>= 3.0.0)
215185
strscan (3.0.4)
216-
temple (0.8.2)
217186
thor (1.2.1)
218187
tilt (2.0.11)
219188
timeout (0.3.0)
220-
turbolinks (5.2.1)
221-
turbolinks-source (~> 5.2)
222-
turbolinks-source (5.2.0)
223189
tzinfo (2.0.5)
224190
concurrent-ruby (~> 1.0)
225191
uglifier (4.2.0)
@@ -230,7 +196,6 @@ GEM
230196
websocket-driver (0.7.5)
231197
websocket-extensions (>= 0.1.0)
232198
websocket-extensions (0.1.5)
233-
wkhtmltoimage-binary (0.12.5)
234199
xpath (3.2.0)
235200
nokogiri (~> 1.8)
236201
zeitwerk (2.6.0)
@@ -241,25 +206,16 @@ PLATFORMS
241206
DEPENDENCIES
242207
benchmark-ips
243208
bootsnap (>= 1.1.0)
244-
byebug
245-
capybara (>= 2.15)
246-
coffee-rails
209+
capybara (~> 3)
247210
factory_bot_rails
248-
haml
249-
jbuilder
250211
octicons_helper
251212
pg (>= 0.18, < 2.0)
252-
pry-rails
253213
puma (~> 4.3)
254214
rails (~> 7)
255215
sassc-rails
256-
simplecov
257-
slim
258-
turbolinks (~> 5)
259216
tzinfo-data
260217
uglifier (>= 1.3.0)
261218
view_component
262-
wkhtmltoimage-binary
263219

264220
RUBY VERSION
265221
ruby 3.0.3p157

config/application.rb

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
require_relative "boot"
22

33
require "rails/all"
4-
require "view_component/engine"
5-
6-
# Require the gems listed in Gemfile, including any gems
7-
# you've limited to :test, :development, or :production.
84
Bundler.require(*Rails.groups)
95

106
module Demo
117
class Application < Rails::Application
12-
# Initialize configuration defaults for originally generated Rails version.
13-
config.load_defaults 5.2
14-
15-
# Settings in config/environments/* take precedence over those specified here.
16-
# Application configuration can go into files in config/initializers
17-
# -- all .rb files in that directory are automatically loaded after loading
18-
# the framework and any gems in your application.
198
end
209
end

test/test_helper.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
require "simplecov"
2-
SimpleCov.start
3-
41
ENV["RAILS_ENV"] ||= "test"
52
require File.expand_path("../../config/environment", __FILE__)
6-
require "view_component/test_helpers"
3+
require "view_component/test_helpers"
4+
require "action_controller/test_case"

0 commit comments

Comments
 (0)