fix using load in command files

Author: grantspeelman

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [Unreleased]
+
+### Fixed
+* fix using `load` in command files
+
 ## [1.9.0]
 [Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.8.1...v1.9.0
 

lib/cypress_on_rails/command_executor.rb

@@ -3,7 +3,7 @@
 module CypressOnRails
   # loads and evals the command files
   class CommandExecutor
-    def self.load(file,command_options = nil)
+    def self.perform(file,command_options = nil)
       load_cypress_helper
       file_data = File.read(file)
       eval file_data, binding, file

lib/cypress_on_rails/middleware.rb

@@ -56,7 +56,7 @@ def handle_command(req)
       missing_command = commands.find {|command| !@file.exists?(command.file_path) }
 
       if missing_command.nil?
-        results = commands.map { |command| @command_executor.load(command.file_path, command.options) }
+        results = commands.map { |command| @command_executor.perform(command.file_path, command.options) }
 
         begin
           output = results.to_json

spec/cypress_on_rails/command_executor_spec.rb

@@ -1,12 +1,12 @@
 require 'cypress_on_rails/command_executor'
 
 RSpec.describe CypressOnRails::CommandExecutor do
-  describe '.load' do
+  describe '.perform' do
     let(:folder) { "#{__dir__}/command_executor" }
     subject { described_class }
 
-    def executor_load(*values)
-      subject.load(*values)
+    def executor_perform(*values)
+      subject.perform(*values)
     end
 
     before do
@@ -15,18 +15,18 @@ def executor_load(*values)
     end
 
     it 'runs test command' do
-      executor_load("#{folder}/test_command.rb")
+      executor_perform("#{folder}/test_command.rb")
       expect(DummyTest.values).to eq(%w(hello))
     end
 
     it 'runs test command twice' do
-      executor_load("#{folder}/test_command.rb")
-      executor_load("#{folder}/test_command.rb")
+      executor_perform("#{folder}/test_command.rb")
+      executor_perform("#{folder}/test_command.rb")
       expect(DummyTest.values).to eq(%w(hello hello))
     end
 
     it 'runs command with options' do
-      executor_load("#{folder}/test_command_with_options.rb", 'my_string')
+      executor_perform("#{folder}/test_command_with_options.rb", 'my_string')
       expect(DummyTest.values).to eq(%w(my_string))
     end
   end

spec/cypress_on_rails/middleware_spec.rb

@@ -16,21 +16,21 @@ def rack_input(json_value)
 
   context '/__cypress__/command' do
     before do
-      allow(command_executor).to receive(:load).and_return({ id: 1, title: 'some result' })
+      allow(command_executor).to receive(:perform).and_return({ id: 1, title: 'some result' })
       allow(file).to receive(:exists?)
       env['PATH_INFO'] = '/__cypress__/command'
     end
 
     it 'command file exists' do
-      allow(command_executor).to receive(:load).and_return({ id: 1, title: 'some result' })
+      allow(command_executor).to receive(:perform).and_return({ id: 1, title: 'some result' })
       env['rack.input'] = rack_input(name: 'seed')
       allow(file).to receive(:exists?).with('spec/cypress/app_commands/seed.rb').and_return(true)
 
       aggregate_failures do
         expect(response).to eq([201,
                                 {"Content-Type"=>"application/json"},
                                 ["[{\"id\":1,\"title\":\"some result\"}]"]])
-        expect(command_executor).to have_received(:load).with('spec/cypress/app_commands/seed.rb', nil)
+        expect(command_executor).to have_received(:perform).with('spec/cypress/app_commands/seed.rb', nil)
       end
     end
 
@@ -42,21 +42,21 @@ def rack_input(json_value)
         expect(response).to eq([201,
                                 {"Content-Type"=>"application/json"},
                                 ["[{\"id\":1,\"title\":\"some result\"}]"]])
-        expect(command_executor).to have_received(:load).with('spec/cypress/app_commands/seed.rb', ['my_options'])
+        expect(command_executor).to have_received(:perform).with('spec/cypress/app_commands/seed.rb', ['my_options'])
       end
     end
 
     it 'command file does not exists' do
       object = BasicObject.new
-      allow(command_executor).to receive(:load).and_return(object)
+      allow(command_executor).to receive(:perform).and_return(object)
       env['rack.input'] = rack_input(name: 'seed')
       allow(file).to receive(:exists?).with('spec/cypress/app_commands/seed.rb').and_return(true)
 
       aggregate_failures do
         expect(response).to eq([201,
                                 {"Content-Type"=>"application/json"},
                                 ["{\"message\":\"Cannot convert to json\"}"]])
-        expect(command_executor).to have_received(:load).with('spec/cypress/app_commands/seed.rb', nil)
+        expect(command_executor).to have_received(:perform).with('spec/cypress/app_commands/seed.rb', nil)
       end
     end
 
@@ -68,7 +68,7 @@ def rack_input(json_value)
         expect(response).to eq([201,
                                 {"Content-Type"=>"application/json"},
                                 ["[{\"id\":1,\"title\":\"some result\"}]"]])
-        expect(command_executor).to have_received(:load).with('spec/cypress/app_commands/seed.rb', nil)
+        expect(command_executor).to have_received(:perform).with('spec/cypress/app_commands/seed.rb', nil)
       end
     end
 
@@ -82,8 +82,8 @@ def rack_input(json_value)
         expect(response).to eq([201,
                                 {"Content-Type"=>"application/json"},
                                 ["[{\"id\":1,\"title\":\"some result\"},{\"id\":1,\"title\":\"some result\"}]"]])
-        expect(command_executor).to have_received(:load).with('spec/cypress/app_commands/load_user.rb', nil)
-        expect(command_executor).to have_received(:load).with('spec/cypress/app_commands/load_sample.rb', {'all' => 'true'})
+        expect(command_executor).to have_received(:perform).with('spec/cypress/app_commands/load_user.rb', nil)
+        expect(command_executor).to have_received(:perform).with('spec/cypress/app_commands/load_sample.rb', {'all' => 'true'})
       end
     end
 
@@ -94,7 +94,7 @@ def rack_input(json_value)
 
       aggregate_failures do
         expect(response).to eq([404, {}, ['could not find command file: spec/cypress/app_commands/load_sample.rb']])
-        expect(command_executor).to_not have_received(:load)
+        expect(command_executor).to_not have_received(:perform)
       end
     end
   end