[rb] fix improperly nested class

titusfortner · titusfortner · commit a528503a367c · 2021-12-01T00:15:26.000-06:00
diff --git a/rb/lib/selenium/webdriver/common/interactions/key_input.rb b/rb/lib/selenium/webdriver/common/interactions/key_input.rb
@@ -20,6 +20,26 @@
 module Selenium
   module WebDriver
     module Interactions
+      class TypingInteraction < Interaction
+        attr_reader :type
+
+        def initialize(source, type, key)
+          super(source)
+          @type = assert_type(type)
+          @key = Keys.encode_key(key)
+        end
+
+        def assert_type(type)
+          raise TypeError, "#{type.inspect} is not a valid key subtype" unless KeyInput::SUBTYPES.key? type
+
+          KeyInput::SUBTYPES[type]
+        end
+
+        def encode
+          {type: @type, value: @key}
+        end
+      end # TypingInteraction
+
       class KeyInput < InputDevice
         SUBTYPES = {down: :keyDown, up: :keyUp, pause: :pause}.freeze
 
@@ -41,25 +61,8 @@ def create_key_up(key)
           add_action(TypingInteraction.new(self, :up, key))
         end
 
-        class TypingInteraction < Interaction
-          attr_reader :type
-
-          def initialize(source, type, key)
-            super(source)
-            @type = assert_type(type)
-            @key = Keys.encode_key(key)
-          end
-
-          def assert_type(type)
-            raise TypeError, "#{type.inspect} is not a valid key subtype" unless KeyInput::SUBTYPES.key? type
-
-            KeyInput::SUBTYPES[type]
-          end
-
-          def encode
-            {type: @type, value: @key}
-          end
-        end # TypingInteraction
+        # Backward compatibility in case anyone called this directly
+        class TypingInteraction < Interactions::TypingInteraction; end
       end # KeyInput
     end # Interactions
   end # WebDriver
diff --git a/rb/spec/unit/selenium/webdriver/common/interactions/input_device_spec.rb b/rb/spec/unit/selenium/webdriver/common/interactions/input_device_spec.rb
@@ -83,7 +83,7 @@ def type
         end
 
         describe '#no_actions?' do
-          let(:typing) { instance_double(KeyInput::TypingInteraction, type: :not_pause) }
+          let(:typing) { instance_double(TypingInteraction, type: :not_pause) }
 
           it 'returns true when all actions are pauses' do
             allow(device).to receive(:type).and_return(:none)
@@ -93,7 +93,7 @@ def type
 
           it 'returns false when not all actions are pauses' do
             allow(device).to receive(:type).and_return(:none)
-            allow(typing).to receive(:class).and_return(KeyInput::TypingInteraction)
+            allow(typing).to receive(:class).and_return(TypingInteraction)
             device.create_pause
             device.add_action(typing)
             expect(device.no_actions?).to be false
diff --git a/rb/spec/unit/selenium/webdriver/common/interactions/key_input_spec.rb b/rb/spec/unit/selenium/webdriver/common/interactions/key_input_spec.rb
@@ -25,7 +25,7 @@ module Interactions
       describe KeyInput do
         let(:key_input) { KeyInput.new(:name) }
         let(:key) { 'a' }
-        let(:interaction) { KeyInput::TypingInteraction.new(key_input, :up, 'a') }
+        let(:interaction) { TypingInteraction.new(key_input, :up, 'a') }
 
         describe '#type' do
           it 'returns :key' do
@@ -56,7 +56,7 @@ module Interactions
 
         describe '#create_key_down' do
           it 'executes #add_action with created interaction' do
-            allow(KeyInput::TypingInteraction).to receive(:new).with(key_input, :down, key).and_return(interaction)
+            allow(TypingInteraction).to receive(:new).with(key_input, :down, key).and_return(interaction)
             allow(key_input).to receive(:add_action).and_call_original
 
             key_input.create_key_down(key)
@@ -67,35 +67,37 @@ module Interactions
 
         describe '#create_key_up' do
           it 'executes #add_action with created interaction' do
-            allow(KeyInput::TypingInteraction).to receive(:new).with(key_input, :up, key).and_return(interaction)
+            allow(TypingInteraction).to receive(:new).with(key_input, :up, key).and_return(interaction)
             allow(key_input).to receive(:add_action).and_call_original
 
             key_input.create_key_up(key)
 
             expect(key_input).to have_received(:add_action).with(interaction)
           end
         end
+      end # KeyInput
 
-        describe 'KeyInput::TypingInteraction' do
-          let(:source) { Interactions.key('keyboard') }
-          let(:type) { :down }
-          let(:typing) { KeyInput::TypingInteraction.new(source, type, key) }
+      describe TypingInteraction do
+        let(:source) { Interactions.key('keyboard') }
+        let(:type) { :down }
+        let(:typing) { TypingInteraction.new(source, type, key) }
+        let(:key) { 'a' }
 
-          it 'stores type as KeyInput::SUBTYPES' do
-            expect(typing.type).to eq KeyInput::SUBTYPES[type]
-          end
+        it 'stores type as KeyInput::SUBTYPES' do
+          expect(typing.type).to eq KeyInput::SUBTYPES[type]
+        end
 
-          it 'raises a TypeError if the passed type is not a key in KeyInput::SUBTYPES' do
-            expect { KeyInput::TypingInteraction.new(source, :none, key) }.to raise_error(TypeError)
-          end
+        it 'raises a TypeError if the passed type is not a key in KeyInput::SUBTYPES' do
+          expect { TypingInteraction.new(source, :none, key) }.to raise_error(TypeError)
+        end
 
-          describe '#encode' do
-            it 'returns a Hash with type and value' do
-              expect(typing.encode).to eq(type: typing.type, value: key)
-            end
+        describe '#encode' do
+          it 'returns a Hash with type and value' do
+            expect(typing.encode).to eq(type: typing.type, value: key)
           end
-        end # KeyInput::TypingInteraction
-      end # KeyInput
+        end
+      end # TypingInteraction
+
     end # Interactions
   end # WebDriver
 end # Selenium
