Find a initial binding for each session

rails · May 26, 2016 · e8f0f7b · e8f0f7b
1 parent ec8d5c5
commit e8f0f7b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/lib/web_console/session.rb b/lib/web_console/session.rb
@@ -43,7 +43,7 @@ def from(storage)
     def initialize(bindings)
       @id = SecureRandom.hex(16)
       @bindings = Array(bindings)
-      @evaluator = Evaluator.new(@bindings[0])
+      @evaluator = Evaluator.new(initial_binding)
 
       store_into_memory
     end
@@ -64,6 +64,10 @@ def switch_binding_to(index)
 
     private
 
+      def initial_binding
+        @bindings.find { |b| b.eval('__FILE__').to_s.start_with?(Rails.root.to_s) }
+      end
+
       def store_into_memory
         inmemory_storage[id] = self
       end

diff --git a/test/web_console/middleware_test.rb b/test/web_console/middleware_test.rb
@@ -36,6 +36,7 @@ def body
     end
 
     setup do
+      Rails.stubs(:root).returns Pathname(__FILE__).parent
       Request.stubs(:whitelisted_ips).returns(IPAddr.new('0.0.0.0/0'))
 
       Middleware.mount_point = ''

diff --git a/test/web_console/session_test.rb b/test/web_console/session_test.rb
@@ -17,8 +17,9 @@ def initialize(line)
     end
 
     setup do
+      Rails.stubs(:root).returns Pathname(__FILE__).parent
       Session.inmemory_storage.clear
-      @session = Session.new TOPLEVEL_BINDING
+      @session = Session.new(binding)
     end
 
     test 'returns nil when a session is not found' do