Skip to content

Commit 543b0e3

Browse files
authored
Merge pull request #1336 from reactjs/judahmeek/ci-sanity-check
Ci Fixes
2 parents 6b65463 + 081e33c commit 543b0e3

File tree

9 files changed

+41
-9
lines changed

9 files changed

+41
-9
lines changed

.github/workflows/ruby.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
with:
9090
persist-credentials: false
9191
- uses: actions/setup-node@v3
92-
- run: npm -g install yalc ${{ matrix.js_package_manager.installer }}
92+
- run: sudo npm -g install yalc ${{ matrix.js_package_manager.installer }}
9393
- run: yalc publish
9494
- name: Save root node_modules to cache
9595
uses: actions/cache@v3

Gemfile

+3
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ source "http://rubygems.org"
44

55
gemspec
66
# This is an optional dev-dependency, required whenever sprockets is required
7+
gem "rubocop"
8+
gem "rubocop-minitest"
9+
gem "rubocop-performance"

Gemfile.lock

+31-5
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ GEM
3636
bundler
3737
rake
3838
thor (>= 0.14.0)
39+
ast (2.4.2)
3940
babel-source (5.8.35)
4041
babel-transpiler (0.7.0)
4142
babel-source (>= 4.0, < 6)
@@ -92,6 +93,7 @@ GEM
9293
actionview (>= 5.0.0)
9394
activesupport (>= 5.0.0)
9495
json (2.3.0)
96+
language_server-protocol (3.17.0.3)
9597
listen (3.0.8)
9698
rb-fsevent (~> 0.9, >= 0.9.4)
9799
rb-inotify (~> 0.9, >= 0.9.7)
@@ -102,12 +104,8 @@ GEM
102104
matrix (0.4.2)
103105
method_source (1.0.0)
104106
mini_mime (1.0.2)
105-
mini_portile2 (2.8.5)
106107
minitest (5.17.0)
107108
nenv (0.3.0)
108-
nokogiri (1.14.3)
109-
mini_portile2 (~> 2.8.0)
110-
racc (~> 1.4)
111109
nokogiri (1.14.3-x86_64-darwin)
112110
racc (~> 1.4)
113111
nokogiri (1.14.3-x86_64-linux)
@@ -116,6 +114,10 @@ GEM
116114
nenv (~> 0.1)
117115
shellany (~> 0.0)
118116
package_json (0.1.0)
117+
parallel (1.24.0)
118+
parser (3.3.0.5)
119+
ast (~> 2.4.1)
120+
racc
119121
pry (0.14.2)
120122
coderay (~> 1.1)
121123
method_source (~> 1.0)
@@ -138,12 +140,33 @@ GEM
138140
method_source
139141
rake (>= 0.8.7)
140142
thor (>= 0.20.3, < 2.0)
143+
rainbow (3.1.1)
141144
rake (13.0.1)
142145
rb-fsevent (0.11.2)
143146
rb-inotify (0.10.1)
144147
ffi (~> 1.0)
145148
regexp_parser (2.6.0)
146149
rexml (3.2.5)
150+
rubocop (1.63.1)
151+
json (~> 2.3)
152+
language_server-protocol (>= 3.17.0)
153+
parallel (~> 1.10)
154+
parser (>= 3.3.0.2)
155+
rainbow (>= 2.2.2, < 4.0)
156+
regexp_parser (>= 1.8, < 3.0)
157+
rexml (>= 3.2.5, < 4.0)
158+
rubocop-ast (>= 1.31.1, < 2.0)
159+
ruby-progressbar (~> 1.7)
160+
unicode-display_width (>= 2.4.0, < 3.0)
161+
rubocop-ast (1.31.2)
162+
parser (>= 3.3.0.4)
163+
rubocop-minitest (0.35.0)
164+
rubocop (>= 1.61, < 2.0)
165+
rubocop-ast (>= 1.31.1, < 2.0)
166+
rubocop-performance (1.21.0)
167+
rubocop (>= 1.48.1, < 2.0)
168+
rubocop-ast (>= 1.31.1, < 2.0)
169+
ruby-progressbar (1.13.0)
147170
rubyzip (2.3.2)
148171
selenium-webdriver (4.9.0)
149172
rexml (~> 3.2, >= 3.2.5)
@@ -161,13 +184,13 @@ GEM
161184
tilt (2.1.0)
162185
tzinfo (1.2.10)
163186
thread_safe (~> 0.1)
187+
unicode-display_width (2.5.0)
164188
websocket (1.2.9)
165189
xpath (3.2.0)
166190
nokogiri (~> 1.8)
167191
zeitwerk (2.6.6)
168192

169193
PLATFORMS
170-
ruby
171194
x86_64-darwin-20
172195
x86_64-linux
173196

@@ -186,6 +209,9 @@ DEPENDENCIES
186209
package_json
187210
pry-byebug
188211
react-rails!
212+
rubocop
213+
rubocop-minitest
214+
rubocop-performance
189215
selenium-webdriver
190216
test-unit (~> 2.5)
191217

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## News
88
V3.0.0 is released with Shakapacker v7 support, including SSR. Please try it out and report any issues. We'll try to address any critical issues ASAP.
99

10-
For version 2.7 documentation checkout [2.7-stable](https://github.com/reactjs/react-rails/tree/2.7-stable) branch.
10+
For version 2.7 documentation, visit the [2.7-stable](https://github.com/reactjs/react-rails/tree/2.7-stable) branch.
1111

1212
## Summary
1313
React-Rails is a flexible tool to use [React](http://facebook.github.io/react/) with Rails. The benefits:

test/dummy/config/initializers/backtrace_silencers.rb

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# frozen_string_literal: true
2+
23
# Be sure to restart your server when you modify this file.
34

45
# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

test/dummy/config/initializers/inflections.rb

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# frozen_string_literal: true
2+
23
# Be sure to restart your server when you modify this file.
34

45
# Add new inflection rules using the following format. Inflections

test/dummy/config/initializers/mime_types.rb

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# frozen_string_literal: true
2+
23
# Be sure to restart your server when you modify this file.
34

45
# Add new mime types for use in respond_to blocks:

test/react/jsx_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
STR
2323

2424
class NullTransformer
25-
def initialize(_options = {}); end # rubocop:disable-line Style/RedundantInitialize
25+
def initialize(_options = {}); end # rubocop:disable Style/RedundantInitialize
2626

2727
def transform(_code)
2828
"TRANSFORMED CODE!;\n"

test/react/rails/controller_lifecycle_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def teardown
4141
get "/pages/1"
4242
helper_obj = controller.__react_component_helper
4343

44-
assert(helper_obj.is_a?(DummyHelperImplementation), "It uses the view helper implementation class")
44+
assert_kind_of(DummyHelperImplementation, helper_obj, "It uses the view helper implementation class")
4545
end
4646

4747
test "it calls setup and teardown methods" do

0 commit comments

Comments
 (0)