integration-tests-rails 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12ec9fa8a5503ba21d04c3700fee04a00413b072a1adb9918fb75714c3e92c8d
-  data.tar.gz: 50c08830a21433430b183ae184df578656108d8ca2257317034f686638d6e619
+  metadata.gz: be57f4d8d66105663b9c082866bcade277fceec8e89254bfd5fa88d3c6c6ec0d
+  data.tar.gz: 0c45dd9db327c01f8e93a6c92c327d45153cdc8ca8ba6a172190d809661490e3
 SHA512:
-  metadata.gz: 9ac0c50347e0bfd28fae19f6495fa61ce1977a863929ed99885ed7c1c0b34c1627a3a5fc82dc9a010ba6c6fcf1cb11340191a7e57a1c31862401581759873ad7
-  data.tar.gz: 3ac047eb7ff7c4da5698b9ea90eb9b0f4e5dedf8f0b5992423a87a582a830b70f339cf3d0309232cf3d0a554a8e2a1fce979e97d8910cf9d07263a75d2879691
+  metadata.gz: 2aa3bbefef1c3ec24a53c9f6e1cd4c3ac2b0549f408b79aa1de3689503e39b96a7fca47a4ffcf61b6ebf9ff9e0f7d4bbf2fa417d5cb36b4b363e896bb9a1fcd0
+  data.tar.gz: a46a8871be677914d9faa52703006719a9ca097e8b5bac8503234ffb5752e6ef097c5d3267dd5df7facd30f0fd6479a8d8f8d023db4046b77b2d1400e5be3876

data/README.md

@@ -176,6 +176,18 @@ let(:script) do
 end
 ```
 
+There is a `function` component that is the same as the `script` component but `function` automatically wraps the containing JavaScript code in an arrow function and executes it. The above can be rewritten as:
+
+```ruby
+let(:function) do
+  <<~JS
+    const value1 = CustomCode.getValue1();
+    const value2 = CustomCode.getValue2();
+    return CustomCode.combineValues(value1, value2);
+  JS
+end
+```
+
 The above will successfully execute the three statements and return the value in `result`. However, this can become a problem if the JavaScript code being tested relies on waiting for each statement to complete. In such cases, it is recommended to use an array instead in `script`:
 
 ```ruby
@@ -191,8 +203,9 @@ let(:script) do
 end
 ```
 
-In such cases where `script` is an array, the `result` component will contain the return value of the **last statement only**.
+In such cases where `script` is an array, the `result` component will contain the return value of the **last statement only**. `function` also supports arrays; each element will be wrapped in an arrow function and executed sequentially.
 
+**Do not use `script` and `function` components as the same time in an example.**
 
 ## Integration Testing
 

data/lib/integration_tests_rails/capybara/helpers.rb

@@ -15,7 +15,26 @@ module IntegrationTestsRails
         end
       end
 
-      let(:script) { nil }
+      let(:script) do
+        case function
+        when Array
+          function.map! do |fn|
+            <<~JSCODE
+              (() => {
+                #{fn}
+              })();
+            JSCODE
+          end
+        when String
+          <<~JSCODE
+            (() => {
+              #{function}
+            })();
+          JSCODE
+        end
+      end
+
+      let(:function) { nil }
 
       before do
         visit tests_path

data/lib/integration_tests_rails/istanbul/collector.rb

@@ -126,11 +126,13 @@ module IntegrationTestsRails
             }
 
             const instrumentedDir = '#{config.output_path}';
+            const backupDir = '#{config.backup_path}';
+            const sourceDir = '#{config.source_path}';
             const instrumentedFiles = findJsFiles(instrumentedDir);
 
             instrumentedFiles.forEach(instrumentedFile => {
               const relativePath = path.relative(instrumentedDir, instrumentedFile);
-              const originalFile = path.join('#{config.source_path}', relativePath);
+              const originalFile = path.join(sourceDir, relativePath);
 
               if (coverageMap.data[originalFile]) return;
 
@@ -140,6 +142,7 @@ module IntegrationTestsRails
 
                 if (match && match[1]) {
                   const coverageData = eval('(' + match[1] + ')');
+                  // Keep original path for display
                   coverageData.path = originalFile;
                   coverageMap.addFileCoverage(coverageData);
                 }
@@ -150,7 +153,21 @@ module IntegrationTestsRails
 
             const context = libReport.createContext({
               dir: 'coverage/javascript',
-              coverageMap: coverageMap
+              coverageMap: coverageMap,
+              sourceFinder: function(filePath) {
+                const relativePath = path.relative(sourceDir, filePath);
+                const backupFile = path.join(backupDir, relativePath);
+
+                try {
+                  // Read content from backup (original source)
+                  if (fs.existsSync(backupFile)) {
+                    return fs.readFileSync(backupFile, 'utf8');
+                  }
+                } catch(e) {
+                  console.error('Could not read backup file:', backupFile, e.message);
+                }
+                return null;
+              }
             });
 
             ['html', 'lcov', 'cobertura'].forEach(reportType => {

data/lib/integration_tests_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IntegrationTestsRails
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: integration-tests-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Tien