Merge branch 'master' into declarative-reflexes-resiliency

stimulusreflex · Sep 4, 2022 · 348c9dd · 348c9dd
2 parents 35c655b + f4572da
commit 348c9dd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 33 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,46 +15,38 @@ jobs:
     strategy:
       matrix:
         node: [12, 14, 16]
+
     steps:
-    - uses: actions/checkout@master
-    - name: Setup Node
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node }}
-    - name: Get yarn cache directory path
-      id: yarn-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-    - uses: actions/cache@v1
-      id: yarn-cache
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ matrix.node }}-yarn-
-
-    - name: Install Playwright
-      uses: microsoft/playwright-github-action@v1
-
-    - name: Yarn install
-      run: yarn
-    - name: Run JavaScript Tests
-      run: yarn run test
+      - uses: actions/checkout@master
+
+      - name: Setup Node v${{ matrix.node }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'yarn'
+
+      - name: Yarn install
+        run: yarn
+
+      - name: Run JavaScript Tests
+        run: yarn run test
+
 
   ruby_test:
     name: Ruby Test Action
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.7, '3.0', 3.1]
+        ruby: [2.7, '3.0', 3.1]
 
     steps:
-    - uses: actions/checkout@master
+      - uses: actions/checkout@master
 
-    - name: Set up Ruby ${{ matrix.ruby-version }}
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true
+      - name: Set up Ruby v${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 
-    - name: Run ruby tests
-      run: bundle exec rake test_ruby
+      - name: Run ruby tests
+        run: bundle exec rake test_ruby
diff --git a/lib/stimulus_reflex/reflex_data.rb b/lib/stimulus_reflex/reflex_data.rb
@@ -74,7 +74,7 @@ def reflex_controller
   end
 
   def version
-    data["version"].gsub("-pre", ".pre")
+    data["version"].to_s.gsub("-pre", ".pre")
   end
 
   private