magic_test 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 055c3c03ddef0cb663a7ed2056b08c550285ff34b467e18225d971fa7f9fc8df
-  data.tar.gz: dad366cfa42271a6ab70654e10ef33395e5f2e3db6362f802fd811e897a82e19
+  metadata.gz: 8157f3ad45a33023af27727450bb43a7a54ef4f390bd21a1d5419f81bfd173d2
+  data.tar.gz: 40eab3d8bfe379bc346f294ed3d881521ddf8defcf7d53a1e60c994050a54b5c
 SHA512:
-  metadata.gz: d95bf68163b3b91ee927958ba914e380f55e28324ae2546aaa6cd036c1bfe3d0295768f82a4f489ca2c14e8b57749e0292c7481dfdfde2e0e55fbbb835d8ddb5
-  data.tar.gz: ed563a867e518ceae203881b718d7637a3730d751bda506786e7b4549a95417202ba9d3ed3bf8a7c8472d72207a457017e73a513b478a032cebadb29166a09ea
+  metadata.gz: 91e84e80faf56d07bf8df3540c09c8324f12e85fe395bf75876d3316ec76d810f19436ceb1773d7848d52cc039c95e853aeac8222af3c9da1042c5ab50ea6d99
+  data.tar.gz: 13fad9265f6b3cf86a2d26760628680dc59c6aeeab896963e18d037effe0c8444e2449a48d2adcabdec937c628d1060ab8328e90565c7c6a772c75395226c106

data/.standard.yml

@@ -0,0 +1,3 @@
+ignore:                 # default: []
+  - 'lib/magic_test/support.rb':
+    - Lint/Debugger

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in magic_test.gemspec
 gemspec

data/Gemfile.lock

@@ -1,81 +1,83 @@
 PATH
   remote: .
   specs:
-    magic_test (0.0.1)
-      capybara (~> 3.0)
+    magic_test (0.0.6)
+      capybara (>= 3.0)
       pry
       pry-stack_explorer
-      rails (~> 6.0)
+      rails (>= 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.3)
-      actionpack (= 6.1.3)
-      activesupport (= 6.1.3)
+    actioncable (7.0.0)
+      actionpack (= 7.0.0)
+      activesupport (= 7.0.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.3)
-      actionpack (= 6.1.3)
-      activejob (= 6.1.3)
-      activerecord (= 6.1.3)
-      activestorage (= 6.1.3)
-      activesupport (= 6.1.3)
+    actionmailbox (7.0.0)
+      actionpack (= 7.0.0)
+      activejob (= 7.0.0)
+      activerecord (= 7.0.0)
+      activestorage (= 7.0.0)
+      activesupport (= 7.0.0)
       mail (>= 2.7.1)
-    actionmailer (6.1.3)
-      actionpack (= 6.1.3)
-      actionview (= 6.1.3)
-      activejob (= 6.1.3)
-      activesupport (= 6.1.3)
+    actionmailer (7.0.0)
+      actionpack (= 7.0.0)
+      actionview (= 7.0.0)
+      activejob (= 7.0.0)
+      activesupport (= 7.0.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.3)
-      actionview (= 6.1.3)
-      activesupport (= 6.1.3)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.0)
+      actionview (= 7.0.0)
+      activesupport (= 7.0.0)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.3)
-      actionpack (= 6.1.3)
-      activerecord (= 6.1.3)
-      activestorage (= 6.1.3)
-      activesupport (= 6.1.3)
+    actiontext (7.0.0)
+      actionpack (= 7.0.0)
+      activerecord (= 7.0.0)
+      activestorage (= 7.0.0)
+      activesupport (= 7.0.0)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.3)
-      activesupport (= 6.1.3)
+    actionview (7.0.0)
+      activesupport (= 7.0.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.3)
-      activesupport (= 6.1.3)
+    activejob (7.0.0)
+      activesupport (= 7.0.0)
       globalid (>= 0.3.6)
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activerecord (6.1.3)
-      activemodel (= 6.1.3)
-      activesupport (= 6.1.3)
-    activestorage (6.1.3)
-      actionpack (= 6.1.3)
-      activejob (= 6.1.3)
-      activerecord (= 6.1.3)
-      activesupport (= 6.1.3)
-      marcel (~> 0.3.1)
-      mimemagic (~> 0.3.2)
-    activesupport (6.1.3)
+    activemodel (7.0.0)
+      activesupport (= 7.0.0)
+    activerecord (7.0.0)
+      activemodel (= 7.0.0)
+      activesupport (= 7.0.0)
+    activestorage (7.0.0)
+      actionpack (= 7.0.0)
+      activejob (= 7.0.0)
+      activerecord (= 7.0.0)
+      activesupport (= 7.0.0)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
-    capybara (3.35.3)
+    capybara (3.36.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
@@ -83,97 +85,114 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    debug_inspector (1.0.0)
+    debug_inspector (1.1.0)
     erubi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.9)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    loofah (2.9.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.2)
+    matrix (0.4.2)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.5.0)
-    minitest (5.14.4)
-    nio4r (2.5.5)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+    mini_mime (1.1.2)
+    mini_portile2 (2.6.1)
+    minitest (5.15.0)
+    nio4r (2.5.8)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    nokogiri (1.11.1-x86_64-darwin)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
-    pry (0.14.0)
+    parallel (1.21.0)
+    parser (3.0.3.2)
+      ast (~> 2.4.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-stack_explorer (0.6.1)
       binding_of_caller (~> 1.0)
       pry (~> 0.13)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.3)
-      actioncable (= 6.1.3)
-      actionmailbox (= 6.1.3)
-      actionmailer (= 6.1.3)
-      actionpack (= 6.1.3)
-      actiontext (= 6.1.3)
-      actionview (= 6.1.3)
-      activejob (= 6.1.3)
-      activemodel (= 6.1.3)
-      activerecord (= 6.1.3)
-      activestorage (= 6.1.3)
-      activesupport (= 6.1.3)
+    rails (7.0.0)
+      actioncable (= 7.0.0)
+      actionmailbox (= 7.0.0)
+      actionmailer (= 7.0.0)
+      actionpack (= 7.0.0)
+      actiontext (= 7.0.0)
+      actionview (= 7.0.0)
+      activejob (= 7.0.0)
+      activemodel (= 7.0.0)
+      activerecord (= 7.0.0)
+      activestorage (= 7.0.0)
+      activesupport (= 7.0.0)
       bundler (>= 1.15.0)
-      railties (= 6.1.3)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.3)
-      actionpack (= 6.1.3)
-      activesupport (= 6.1.3)
+    railties (7.0.0)
+      actionpack (= 7.0.0)
+      activesupport (= 7.0.0)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.0.0)
+    rake (13.0.6)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
+    rubocop (1.23.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.12.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.12.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
+    standard (1.5.0)
+      rubocop (= 1.23.0)
+      rubocop-performance (= 1.12.0)
     thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    websocket-driver (0.7.3)
+    unicode-display_width (2.1.0)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
   x86_64-darwin-20
 
 DEPENDENCIES
-  bundler (~> 2.0)
+  bundler (>= 2.0)
   magic_test!
-  minitest (~> 5.0)
-  rake (~> 13.0)
+  minitest (>= 5.0)
+  rake (>= 13.0)
+  standard
 
 BUNDLED WITH
-   2.2.0
+   2.2.22

data/README.md

@@ -1,8 +1,20 @@
 # Magic Test
 
-Magic Test allows you to write Rails system tests interactively through a combination of trial-and-error in a debugger session and also just simple clicking around in the application being tested, all without the slowness of constantly restarting the testing environment.
+Magic Test allows you to write Rails system tests interactively through a combination of trial-and-error in a debugger session and also just simple clicking around in the application being tested, all without the slowness of constantly restarting the testing environment. You can [see some videos of it in action](https://twitter.com/andrewculver/status/1366062684802846721)!
 
-> Magic Test is still in early development, and that includes the documentation. Any questions you have that aren't already address in the documentation should be [opened as issues](https://github.com/bullet-train-co/magic_test/issues/new) so they can be appropriately addressed in the documentation.
+> Magic Test is still in early development, and that includes the documentation. Any questions you have that aren't already address in the documentation should be [opened as issues](https://github.com/bullet-train-co/magic_test/issues/new) so they can be appropriately addressed in the documentation. 
+
+Magic Test was created by [Andrew Culver](http://twitter.com/andrewculver) and [Adam Pallozzi](https://twitter.com/adampallozzi).
+
+## Sponsored By
+
+<a href="https://bullettrain.co" target="_blank">
+  <img src="https://github.com/CanCanCommunity/cancancan/raw/develop/logo/bullet_train.png" alt="Bullet Train" width="400"/>
+</a>
+<br/>
+<br/>
+
+> Would you like to support Magic Test development and have your logo featured here? [Reach out!](http://twitter.com/andrewculver)
 
 ## Installation
 
@@ -18,14 +30,12 @@ Then run the following in your shell:
 bundle install
 ```
 
-Next, run the install generator. If your application already includes jQuery, you can just run:
+Next, run the install generator:
 
 ```
 rails g magic_test:install
 ```
 
-> If your application doesn't include jQuery, you'll need to let Magic Test know to include it as needed. Just add `no` to the end of the line above or adjust your configuration afterward in `config/initializers/magic_test.rb`. We'll only inject jQuery when Magic Test is actively running. It will never show up on CI.
-
 With this we will:
 
  - Create a sample system test at `test/system/basics_test.rb` that invokes Magic Test.
@@ -59,7 +69,7 @@ If you have the screen real estate, we recommend organizing the three windows so
 
 ### Writing Tests Manually in the Debugger Console
 
-You’re now free to type Capybara commands in the debugger and see their results in the Chrome browser. If you type something and you’re with the result, type `ok` and hit enter to have the last line of code you wrote added to the test.
+You’re now free to issue Capybara commands in the debugger and see their results in the Chrome browser. If you type something and you’re happy with the result, type `ok` and hit enter to have the last line or block of code you wrote added to the test.
 
 When you’re done writing the test interactively, you can press <kbd>Control</kbd> + <kbd>D</kbd> to finish running the test.
 
@@ -85,6 +95,9 @@ The interactive actions you make in your app are not automatically written to yo
 
 When generating test code, we check to ensure a given label or element identifier won’t result in multiple or ambiguous matches the next time a test runs. If that situation arises, we’ll try to generate the appropriate `within` blocks and selectors to ensure the target button or field is disambiguated.
 
+## Acknowledgements
+We'd like to thank [Florian Plank](https://twitter.com/polarblau), the author of [Capycorder](https://github.com/polarblau/capycorder). His earlier attempt at the same concept (implemented via a Chrome extension) was ahead of its time and provided us with great inspiration and lessons learned when solving this problem from another angle.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/bullet-train-co/magic_test. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/Rakefile

@@ -7,4 +7,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+task default: :test

data/app/views/magic_test/_context_menu.html

@@ -1,10 +1,17 @@
 <script>
+  function ready(fn) {
+    if (document.readyState !== 'loading'){
+      fn();
+    } else {
+      document.addEventListener('DOMContentLoaded', fn);
+    }
+  }
 
-  // TODO do we have to do this differently for turbo?
-  $(document).ready(function() {
+  ready(function() {
     enableKeyboardShortcuts();
   });
 
+
   function enableKeyboardShortcuts() {
     function keydown(event) {
       if (event.ctrlKey && event.shiftKey && event.key === 'A') {
@@ -16,9 +23,9 @@
     document.addEventListener('keydown', keydown, false);
 
     function generateAssertion() {
-      var text = selectedText();
-      if (text.trim().length > 0) {
-        var action = "assert page.has_content?('" + text.replace("'", "\\\'") +  "')";
+      var text = selectedText().trim();
+      if (text.length > 0) {
+        var action = "assert page.has_content? '" + text.replace("'", "\\\'") +  "'";
         var testingOutput = JSON.parse(sessionStorage.getItem("testingOutput"));
         var target = "";
         var options = "";

data/app/views/magic_test/_finders.html

@@ -1,7 +1,7 @@
 <script>
 
   function getPathTo(element) {
-    if (element.tagName == 'HTML') {
+    if (element.tagName === 'HTML') {
       return '/HTML[1]';
     }
     if (element===document.body) {
@@ -20,27 +20,30 @@
     }
   }
 
-  // Chrome doesn't respond to the jQuery :visible selector properly so we have to do this:
-  function visibleFilter(){
-    return $(this).css('display') != 'none' && $(this).css('visibility') != 'hidden';
+  function visibleFilter(target){
+    var computedStyle = window.getComputedStyle(target);
+    return !(computedStyle.display === 'none' || computedStyle.visibility === 'hidden' || target.hidden)
   }
 
 
   function finderForElement(element) {
     // Try to find just using the element tagName
     var tagName = element.tagName.toLowerCase();
-    if ($(tagName).length == 1) {
+    if (document.querySelectorAll(tagName).length === 1) {
       return `find('${tagName}')`;
     }
     // Try adding in the classes of the element
     var classList = [].slice.apply(element.classList)
     var classString = classList.length ? "." + classList.join('.') : "";
-    if (classList.length && $(tagName + classList).length == 1) {
+    if (classList.length && document.querySelectorAll(tagName + classList).length === 1) {
       return `find('${tagName}${classString}')`;
     }
     // Try adding in the text of the element
     var text = element.textContent.trim();
-    if (text && $(tagName + classString + `:contains(${text}):visible`).filter(visibleFilter).length == 1) {
+    var targets = Array.from(document.querySelectorAll(`${tagName}${classString}`))
+                       .filter(visibleFilter)
+                       .filter((el) => el.textContent.includes(text))
+    if (text && targets.length === 1) {
       return `find('${tagName}${classString}', text: '${text}')`;
     }
     // use the xpath to the element
@@ -48,4 +51,4 @@
   }
 
 
-</script>
+</script>

data/app/views/magic_test/_javascript_helpers.html

@@ -1,29 +1,30 @@
 <script text="text/javascript">
 
-  $(function() {
+  ready(function() {
     console.log("🪄 Magic Test activated in the browser!")
     initializeStorage();
     initializeMutationObserver();
   });
 
   function clickFunction(event) {
-    var tagName = event.currentTarget.tagName
+    var element = event.target
+    var tagName = element.tagName
     var action = ""
     var target = ""
     var options = ""
-    if (tagName == "BUTTON" || tagName == "A" || (tagName == "INPUT" && event.currentTarget.type == 'submit')) {
+    if (tagName == "BUTTON" || tagName == "A" || (tagName == "INPUT" && element.type == 'submit')) {
       action = "click_on"
-      var target = event.currentTarget.value || event.currentTarget.text
+      target = element.value || element.text
       if (!target) {
         return;
       }
       target = "\'" + target.trim().replace("'", "\\\'") + "\'"
     } else if (tagName == "INPUT") {
       let ignoreType = ['text', 'password', 'date', 'email', 'month', 'number', 'search']
-      if (ignoreType.includes(event.currentTarget.type)) {
+      if (ignoreType.includes(element.type)) {
         return;
       }
-      var path = getPathTo(event.currentTarget)
+      var path = getPathTo(element)
       action = `find(:xpath, '${path}').click`
     } else {
       return;

data/app/views/magic_test/_listeners.html

@@ -4,6 +4,5 @@
   document.addEventListener('keypress', function(e){keypressFunction(e)});
   document.addEventListener('mouseover', function(evt){mutationStart(evt)}, true);
   document.addEventListener('mouseover', function(){mutationEnd()}, false);
-
-  $(document).on('click', '*', function(event){clickFunction(event)});
+  document.addEventListener('click', function(event){clickFunction(event)});
 </script>

data/app/views/magic_test/_support.html.erb

@@ -1,8 +1,4 @@
 <% if Rails.env.test? && ENV['MAGIC_TEST'].present? %>
-  <% unless MagicTest.jquery_already_included %>
-    <script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
-  <% end %>
-
   <%= render 'magic_test/context_menu' %>
   <%= render 'magic_test/key_codes' %>
   <%= render 'magic_test/storage' %>

data/lib/generators/magic_test/install_generator.rb

@@ -1,40 +1,28 @@
-require 'rails/generators'
-require 'magic_test/engine'
+require "rails/generators"
+require "magic_test/engine"
 
 module MagicTest
   class InstallGenerator < Rails::Generators::Base
     def self.source_paths
-      [MagicTest::Engine.root, File.expand_path('../templates', __FILE__)]
-    end
-
-    argument :jquery_already_included, :type => :string, :default => 'yes'
-
-    # Override the attr_accessor generated by 'argument' so that
-    # subscription_owner_model is always returned lowercase.
-    def jquery_already_included
-      @jquery_already_included.strip.downcase.first == 'y'
+      [MagicTest::Engine.root, File.expand_path("../templates", __FILE__)]
     end
 
     def install
       unless defined?(MagicTest)
         gem_group :test do
-          gem 'magic_test'
+          gem "magic_test"
         end
       end
 
-      template 'config/initializers/magic_test.rb'
-
-      generate 'system_test', 'basic'
-      gsub_file 'test/system/basics_test.rb', '# ', ''
-      gsub_file 'test/system/basics_test.rb', '#', ''
-      gsub_file 'test/system/basics_test.rb', 'visiting the index', 'getting started'
-      gsub_file 'test/system/basics_test.rb', 'visit basics_url', 'visit root_url'
-      gsub_file 'test/system/basics_test.rb', 'assert_selector "h1", text: "Basic"', 'magic_test'
-
-      gsub_file 'test/application_system_test_case.rb', 'using: :headless_chrome', "using: (ENV['SHOW_TESTS'] ? :chrome : :headless_chrome)"
-      gsub_file 'test/application_system_test_case.rb', 'using: :headless_firefox', "using: (ENV['SHOW_TESTS'] ? :firefox : :headless_firefox)"
-
+      generate "system_test", "basic"
+      gsub_file "test/system/basics_test.rb", "# ", ""
+      gsub_file "test/system/basics_test.rb", "#", ""
+      gsub_file "test/system/basics_test.rb", "visiting the index", "getting started"
+      gsub_file "test/system/basics_test.rb", "visit basics_url", "visit root_url"
+      gsub_file "test/system/basics_test.rb", 'assert_selector "h1", text: "Basic"', "magic_test"
 
+      gsub_file "test/application_system_test_case.rb", "using: :headless_chrome", "using: (ENV['SHOW_TESTS'] ? :chrome : :headless_chrome)"
+      gsub_file "test/application_system_test_case.rb", "using: :headless_firefox", "using: (ENV['SHOW_TESTS'] ? :firefox : :headless_firefox)"
     end
   end
 end

data/lib/magic_test/engine.rb

@@ -1,9 +1,11 @@
-require 'magic_test/support'
+require "magic_test/support"
+require "pry"
+require "pry-stack_explorer"
 
 module MagicTest
   class Engine < Rails::Engine
     config.after_initialize do
-      if ENV['MAGIC_TEST'].present?
+      if ENV["MAGIC_TEST"].present?
         if defined? ActionDispatch::SystemTestCase
           ActionDispatch::SystemTestCase.include MagicTest::Support
         end
@@ -11,6 +13,12 @@ module MagicTest
         if defined? ActionDispatch::IntegrationTest
           ActionDispatch::IntegrationTest.include MagicTest::Support
         end
+
+        if defined? RSpec
+          RSpec.configure do |config|
+            config.include MagicTest::Support, type: :system
+          end
+        end
       end
     end
   end

data/lib/magic_test/railtie.rb

@@ -1,7 +1,7 @@
 module MagicTest
   class Railtie < Rails::Railtie
     rake_tasks do
-      Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
+      Dir[File.join(File.dirname(__FILE__), "../tasks/*.rake")].each { |f| load f }
     end
   end
 end

data/lib/magic_test/support.rb

@@ -3,14 +3,16 @@ module MagicTest
     def assert_selected_exists
       selected_text = page.evaluate_script("window.selectedText()")
       return if selected_text.blank?
-      filepath, line = caller.select { |s| s.include?("/test/") }.reject { |s| s.include?("helper") }.first.split(':')
+
+      filepath, line = get_last_caller(caller)
+
       contents = File.open(filepath).read.lines
       chunks = contents.each_slice(line.to_i - 1 + @test_lines_written).to_a
       indentation = chunks[1].first.match(/^(\s*)/)[0]
       chunks.first << indentation + "assert(page.has_content?('#{selected_text.gsub("'", "\\\\'")}'))" + "\n"
       @test_lines_written += 1
       contents = chunks.flatten.join
-      File.open(filepath, 'w') do |file|
+      File.open(filepath, "w") do |file|
         file.puts(contents)
       end
     end
@@ -19,24 +21,9 @@ module MagicTest
       page.evaluate_script("trackKeystrokes()")
     end
 
-    def get_last
-      history_lines = Readline::HISTORY.to_a.last(20)
-      i = 2
-      last = history_lines.last(2).first
-      last_block = [last]
-      if last == 'end' || last.first(4) == 'end '
-        i += 1
-        last_block.unshift(history_lines.last(i).first)
-        until !last_block.first.match(/^(\s+)/)&[0] do
-          i += 1
-          last_block.unshift(history_lines.last(i).first)
-        end
-      end
-      return last_block
-    end
-
     def flush
-      filepath, line = caller.select { |s| s.include?("/test/") }.reject { |s| s.include?("helper") }.first.split(':')
+      filepath, line = get_last_caller(caller)
+
       contents = File.open(filepath).read.lines
       chunks = contents.each_slice(line.to_i - 1 + @test_lines_written).to_a
       indentation = chunks[1].first.match(/^(\s*)/)[0]
@@ -48,11 +35,11 @@ module MagicTest
       puts "(writing that to `#{filepath}`.)"
       if output
         output.each do |last|
-          chunks.first << indentation + "#{last['action']} #{last['target']}#{last['options']}" + "\n"
+          chunks.first << indentation + "#{last["action"]} #{last["target"]}#{last["options"]}" + "\n"
           @test_lines_written += 1
         end
         contents = chunks.flatten.join
-        File.open(filepath, 'w') do |file|
+        File.open(filepath, "w") do |file|
           file.puts(contents)
         end
         # clear the testing output now.
@@ -60,11 +47,12 @@ module MagicTest
       else
         puts "`window.testingOutput` was empty in the browser. Something must be wrong on the browser side."
       end
-      return true
+      true
     end
 
     def ok
-      filepath, line = caller.select { |s| s.include?("/test/") }.reject { |s| s.include?("helper") }.first.split(':')
+      filepath, line = get_last_caller(caller)
+
       puts "(writing that to `#{filepath}`.)"
       contents = File.open(filepath).read.lines
       chunks = contents.each_slice(line.to_i - 1 + @test_lines_written).to_a
@@ -74,14 +62,17 @@ module MagicTest
         @test_lines_written += 1
       end
       contents = chunks.flatten.join
-      File.open(filepath, 'w') do |file|
+      File.open(filepath, "w") do |file|
         file.puts(contents)
       end
-      return true
+      true
     end
 
     def empty_cache
       page.evaluate_script("sessionStorage.setItem('testingOutput', JSON.stringify([]))")
+    rescue Capybara::NotSupportedByDriverError => _
+      # TODO we need to add more robust instructions for this.
+      raise "You need to configure this test (or your test suite) to run in a real browser (Chrome, Firefox, etc.) in order for Magic Test to work. It also needs to run in non-headless mode if `ENV['MAGIC_TEST'].present?`"
     end
 
     def magic_test
@@ -94,5 +85,31 @@ module MagicTest
         retry
       end
     end
+
+    private
+
+    def get_last
+      history_lines = Readline::HISTORY.to_a.last(20)
+      i = 2
+      last = history_lines.last(2).first
+      last_block = [last]
+      if last == "end" || last.first(4) == "end "
+        i += 1
+        last_block.unshift(history_lines.last(i).first)
+        until !last_block.first.match(/^(\s+)/) & [0]
+          i += 1
+          last_block.unshift(history_lines.last(i).first)
+        end
+      end
+
+      last_block
+    end
+
+    # TODO this feels like it's going to end up burning people who have other support files in `test` or `spec` that don't include `helper` in the name.
+    def get_last_caller(caller)
+      caller.select { |s| s.include?("/test/") || s.include?("/spec/") }
+        .reject { |s| s.include?("helper") }
+        .first.split(":").first(2)
+    end
   end
 end

data/lib/magic_test/version.rb

@@ -1,3 +1,3 @@
 module MagicTest
-  VERSION = "0.0.3"
+  VERSION = "0.0.7"
 end

data/lib/magic_test.rb

@@ -6,9 +6,6 @@ require "magic_test/support"
 module MagicTest
   class Error < StandardError; end
 
-  mattr_accessor :jquery_already_included
-  @@jquery_already_included = false
-
   def self.setup
     yield self
   end

data/lib/tasks/magic_test.rake

@@ -1,6 +1,6 @@
 namespace :magic_test do
   desc "Install Magic Test"
   task :install do
-    system 'rails g magic_test:install'
+    system "rails g magic_test:install"
   end
 end

data/magic_test.gemspec

@@ -3,30 +3,31 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "magic_test/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "magic_test"
-  spec.version       = MagicTest::VERSION
-  spec.authors       = ["Andrew Culver", "Adam Pallozzi"]
-  spec.email         = ["andrew.culver@gmail.com", "adampallozzi@gmail.com"]
+  spec.name = "magic_test"
+  spec.version = MagicTest::VERSION
+  spec.authors = ["Andrew Culver", "Adam Pallozzi"]
+  spec.email = ["andrew.culver@gmail.com", "adampallozzi@gmail.com"]
 
-  spec.summary       = %q{Create system tests interactively.}
-  spec.homepage      = "https://github.com/bullet-train/magic_test"
-  spec.license       = "MIT"
+  spec.summary = "Create system tests interactively."
+  spec.homepage = "https://github.com/bullet-train/magic_test"
+  spec.license = "MIT"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "bundler", ">= 2.0"
+  spec.add_development_dependency "rake", ">= 13.0"
+  spec.add_development_dependency "minitest", ">= 5.0"
+  spec.add_development_dependency "standard"
 
   spec.add_dependency "pry"
   spec.add_dependency "pry-stack_explorer"
-  spec.add_dependency "capybara", "~> 3.0"
-  spec.add_dependency "rails", "~> 6.0"
+  spec.add_dependency "capybara", ">= 3.0"
+  spec.add_dependency "rails", ">= 6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_test
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
 platform: ruby
 authors:
 - Andrew Culver
@@ -9,50 +9,64 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-28 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -85,28 +99,28 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 description:
@@ -118,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".standard.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -136,7 +151,6 @@ files:
 - bin/console
 - bin/setup
 - lib/generators/magic_test/install_generator.rb
-- lib/generators/magic_test/templates/config/initializers/magic_test.rb
 - lib/magic_test.rb
 - lib/magic_test/engine.rb
 - lib/magic_test/railtie.rb
@@ -163,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Create system tests interactively.

data/lib/generators/magic_test/templates/config/initializers/magic_test.rb

@@ -1,3 +0,0 @@
-MagicTest.setup do |config|
-  config.jquery_already_included = <%= jquery_already_included ? 'true' : 'false' %>
-end if Rails.env.test?