stealth 1.1.3 → 2.0.0.beta2

data/spec/controller/callbacks_spec.rb

@@ -1,57 +1,48 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '/spec_helper'))
+require 'spec_helper'
+
+$history = []
 
 class BotController < Stealth::Controller
   before_action :fetch_user_name
 
-  attr_accessor :record
-
   def some_action
-    @record = []
     step_to flow: 'flow_tester', state: 'my_action'
   end
 
   def other_action
-    @record = []
     step_to flow: 'other_flow_tester', state: 'other_action'
   end
 
   def halted_action
-    @record = []
     step_to flow: 'flow_tester', state: 'my_action2'
   end
 
   def filtered_action
-    @record = []
     step_to flow: 'flow_tester', state: 'my_action3'
   end
 
   def some_other_action2
-    @record = []
     step_to flow: 'other_flow_tester', state: 'other_action2'
   end
 
   def some_other_action3
-    @record = []
     step_to flow: 'other_flow_tester', state: 'other_action3'
   end
 
   def some_other_action4
-    @record = []
     step_to flow: 'other_flow_tester', state: 'other_action4'
   end
 
   def some_other_action5
-    @record = []
     step_to flow: 'other_flow_tester', state: 'other_action5'
   end
 
   private
 
     def fetch_user_name
-      @record << "fetched user name"
+      $history << "fetched user name"
     end
 end
 
@@ -77,7 +68,7 @@ class FlowTestersController < BotController
   protected
 
     def test_action
-      @record << "tested action"
+      $history << "tested action"
     end
 
     def test_before_halting
@@ -85,11 +76,11 @@ class FlowTestersController < BotController
     end
 
     def test_filtering
-      @record << "filtered"
+      $history << "filtered"
     end
 
     def test_after_halting
-      @record << "after action ran"
+      $history << "after action ran"
     end
 end
 
@@ -125,11 +116,11 @@ class OtherFlowTestersController < BotController
   private
 
     def after_action1
-      @record << "after action 1"
+      $history << "after action 1"
     end
 
     def after_action2
-      @record << "after action 2"
+      $history << "after action 2"
     end
 
     def run_halt
@@ -137,9 +128,9 @@ class OtherFlowTestersController < BotController
     end
 
     def run_around_filter
-      @record << "around before"
+      $history << "around before"
       yield
-      @record << "around after"
+      $history << "around after"
     end
 end
 
@@ -165,29 +156,33 @@ describe "Stealth::Controller callbacks" do
 
   let(:facebook_message) { SampleMessage.new(service: 'facebook') }
 
+  before(:each) do
+    $history = []
+  end
+
   describe "before_action" do
     it "should fire the callback on the parent class" do
       controller = BotController.new(service_message: facebook_message.message_with_text)
       controller.other_action
-      expect(controller.record).to eq ["fetched user name"]
+      expect($history).to eq ["fetched user name"]
     end
 
     it "should fire the callback on a child class" do
       controller = FlowTestersController.new(service_message: facebook_message.message_with_text)
       controller.some_action
-      expect(controller.record).to eq ["fetched user name", "tested action"]
+      expect($history).to eq ["fetched user name", "tested action"]
     end
 
     it "should halt the callback chain when :abort is thrown" do
       controller = FlowTestersController.new(service_message: facebook_message.message_with_text)
       controller.halted_action
-      expect(controller.record).to eq ["fetched user name"]
+      expect($history).to eq ["fetched user name"]
     end
 
     it "should respect 'unless' filter" do
       controller = FlowTestersController.new(service_message: facebook_message.message_with_text)
       controller.filtered_action
-      expect(controller.record).to eq ["fetched user name", "tested action", "filtered"]
+      expect($history).to eq ["fetched user name", "tested action", "filtered"]
     end
   end
 
@@ -195,13 +190,13 @@ describe "Stealth::Controller callbacks" do
     it "should fire the after callbacks in reverse order" do
       controller = OtherFlowTestersController.new(service_message: facebook_message.message_with_text)
       controller.some_other_action2
-      expect(controller.record).to eq ["fetched user name", "after action 2", "after action 1"]
+      expect($history).to eq ["fetched user name", "after action 2", "after action 1"]
     end
 
     it "should not fire after callbacks if a before callback throws an :abort" do
       controller = OtherFlowTestersController.new(service_message: facebook_message.message_with_text)
       controller.some_other_action3
-      expect(controller.record).to eq ["fetched user name"]
+      expect($history).to eq ["fetched user name"]
     end
   end
 
@@ -209,13 +204,13 @@ describe "Stealth::Controller callbacks" do
     it "should fire the around callback before and after" do
       controller = OtherFlowTestersController.new(service_message: facebook_message.message_with_text)
       controller.some_other_action4
-      expect(controller.record).to eq ["fetched user name", "around before", "around after"]
+      expect($history).to eq ["fetched user name", "around before", "around after"]
     end
 
     it "should not fire the around callback if a before callback throws abort" do
       controller = OtherFlowTestersController.new(service_message: facebook_message.message_with_text)
       controller.some_other_action5
-      expect(controller.record).to eq ["fetched user name"]
+      expect($history).to eq ["fetched user name"]
     end
   end
 

data/spec/controller/catch_all_spec.rb

@@ -1,35 +1,22 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '/spec_helper'))
+require 'spec_helper'
 
 describe "Stealth::Controller::CatchAll" do
-
-  class VadersController < Stealth::Controller
-    def my_action
-      raise "oops"
-    end
-
-    def my_action2
-
-    end
-
-    def my_action3
-
-    end
-  end
+  $msg = nil
 
   class StubbedCatchAllsController < Stealth::Controller
     def level1
-
+      $msg = current_message
+      do_nothing
     end
 
     def level2
-
+      do_nothing
     end
 
     def level3
-
+      do_nothing
     end
   end
 
@@ -40,6 +27,8 @@ describe "Stealth::Controller::CatchAll" do
       state :my_action
       state :my_action2
       state :my_action3
+      state :action_with_unrecognized_msg
+      state :action_with_unrecognized_match
     end
 
     flow :catch_all do
@@ -64,30 +53,26 @@ describe "Stealth::Controller::CatchAll" do
     it "should step_to catch_all->level1 when a StandardError is raised" do
       controller.current_session.session = Stealth::Session.canonical_session_slug(flow: 'vader', state: 'my_action')
       controller.action(action: :my_action)
-      expect(controller.current_session.flow_string).to eq("catch_all")
-      expect(controller.current_session.state_string).to eq("level1")
+      expect($redis.get(controller.current_session.session_key)).to eq('catch_all->level1')
     end
 
     it "should step_to catch_all->level1 when an action doesn't progress the flow" do
       controller.current_session.session = Stealth::Session.canonical_session_slug(flow: 'vader', state: 'my_action2')
       controller.action(action: :my_action2)
-      expect(controller.current_session.flow_string).to eq("catch_all")
-      expect(controller.current_session.state_string).to eq("level1")
+      expect($redis.get(controller.current_session.session_key)).to eq('catch_all->level1')
     end
 
     it "should step_to catch_all->level2 when an action raises back to back" do
       controller.step_to flow: :vader, state: :my_action
       controller.step_to flow: :vader, state: :my_action
-      expect(controller.current_session.flow_string).to eq("catch_all")
-      expect(controller.current_session.state_string).to eq("level2")
+      expect($redis.get(controller.current_session.session_key)).to eq('catch_all->level2')
     end
 
     it "should step_to catch_all->level3 when an action raises back to back to back" do
       controller.step_to flow: :vader, state: :my_action
       controller.step_to flow: :vader, state: :my_action
       controller.step_to flow: :vader, state: :my_action
-      expect(controller.current_session.flow_string).to eq("catch_all")
-      expect(controller.current_session.state_string).to eq("level3")
+      expect($redis.get(controller.current_session.session_key)).to eq('catch_all->level3')
     end
 
     it "should just stop after the maximum number of catch_all levels have been reached" do
@@ -95,8 +80,75 @@ describe "Stealth::Controller::CatchAll" do
       controller.step_to flow: :vader, state: :my_action
       controller.step_to flow: :vader, state: :my_action
       controller.step_to flow: :vader, state: :my_action
-      expect(controller.current_session.flow_string).to eq("vader")
-      expect(controller.current_session.state_string).to eq("my_action")
+      expect($redis.get(controller.current_session.session_key)).to eq('vader->my_action')
+    end
+
+    it "should NOT run the catch_all if do_nothing is called" do
+      controller.current_session.set_session(new_flow: 'vader', new_state: 'my_action3')
+      controller.action(action: :my_action3)
+      expect($redis.get(controller.current_session.session_key)).to eq('vader->my_action3')
+    end
+
+    describe "catch_alls from within catch_all flow" do
+      let(:e) {
+        e = OpenStruct.new
+        e.class = RuntimeError
+        e.message = 'oops'
+        e.backtrace = [
+          '/stealth/lib/stealth/controller/controller.rb',
+          '/stealth/lib/stealth/controller/catch_all.rb',
+        ]
+        e
+      }
+
+      before(:each) do
+        controller.current_session.session = Stealth::Session.canonical_session_slug(flow: 'catch_all', state: 'level1')
+      end
+
+      it "should not step_to to catch_all" do
+        expect(controller).to_not receive(:step_to)
+        controller.run_catch_all(err: e)
+      end
+
+      it "should return false" do
+        expect(controller.run_catch_all(err: e)).to be false
+      end
+
+      it "should log the error message" do
+        expect(Stealth::Logger).to receive(:l).with(topic: 'catch_all', message: "[Level 1] for user #{facebook_message.sender_id} OpenStruct\noops\n/stealth/lib/stealth/controller/controller.rb\n/stealth/lib/stealth/controller/catch_all.rb")
+        expect(Stealth::Logger).to receive(:l).with(topic: 'catch_all', message: "CatchAll triggered for user #{facebook_message.sender_id} from within CatchAll; ignoring.")
+        controller.run_catch_all(err: e)
+      end
+    end
+
+    describe "catch_all_reason" do
+      before(:each) do
+        @session = Stealth::Session.new(id: controller.current_session_id)
+        @session.set_session(new_flow: 'vader', new_state: 'my_action2')
+      end
+
+      after(:each) do
+        $msg = nil
+      end
+
+      it 'should have access to the error raised in current_message.catch_all_reason' do
+        controller.action(action: :my_action)
+        expect($msg.catch_all_reason).to be_a(Hash)
+        expect($msg.catch_all_reason[:err]).to eq(RuntimeError)
+        expect($msg.catch_all_reason[:err_msg]).to eq('oops')
+      end
+
+      it 'should have the correct error when handle_message fails to recognize a message' do
+        controller.action(action: :action_with_unrecognized_msg)
+        expect($msg.catch_all_reason[:err]).to eq(Stealth::Errors::UnrecognizedMessage)
+        expect($msg.catch_all_reason[:err_msg]).to eq("The reply '#{facebook_message.message_with_text.message}' was not recognized.")
+      end
+
+      it 'should have the correct error when get_match fails to recognize a message' do
+        controller.action(action: :action_with_unrecognized_match)
+        expect($msg.catch_all_reason[:err]).to eq(Stealth::Errors::UnrecognizedMessage)
+        expect($msg.catch_all_reason[:err_msg]).to eq("The reply '#{facebook_message.message_with_text.message}' was not recognized.")
+      end
     end
   end
 end

data/spec/controller/controller_spec.rb

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '/spec_helper'))
+require 'spec_helper'
 
 describe "Stealth::Controller" do
 
@@ -25,12 +24,24 @@ describe "Stealth::Controller" do
     end
 
     def other_action2
-
+      step_to state: :other_action4
     end
 
     def other_action3
 
     end
+
+    def other_action4
+      do_nothing
+    end
+
+    def broken_action
+      raise StandardError
+    end
+
+    def parts_unknown
+      step_to flow: :parts, state: :unknown
+    end
   end
 
   class FlowMap
@@ -46,27 +57,26 @@ describe "Stealth::Controller" do
       state :other_action
       state :other_action2
       state :other_action3
+      state :other_action4
+      state :broken_action
+      state :part_unknown
       state :deprecated_action, redirects_to: :other_action
       state :deprecated_action2, redirects_to: 'mr_robot->my_action'
     end
   end
 
   let(:facebook_message) { SampleMessage.new(service: 'facebook') }
-  let(:controller) { MrTronsController.new(service_message: facebook_message.message_with_text) }
+  let(:controller) {
+    MrTronsController.new(service_message: facebook_message.message_with_text)
+  }
 
   describe "convenience methods" do
     it "should make the session ID accessible via current_session_id" do
-      controller.current_session.set(flow: 'mr_tron', state: 'other_action')
+      controller.current_session.set_session(new_flow: 'mr_tron', new_state: 'other_action')
 
       expect(controller.current_session_id).to eq(facebook_message.sender_id)
     end
 
-    it "should make the session ID accessible via current_user_id" do
-      controller.current_session.set(flow: 'mr_tron', state: 'other_action')
-
-      expect(controller.current_user_id).to eq(facebook_message.sender_id)
-    end
-
     it "should make the message available in current_message.message" do
       expect(controller.current_message.message).to eq(facebook_message.message)
     end
@@ -126,9 +136,9 @@ describe "Stealth::Controller" do
 
     it "should step_to the specified redirect flow and state when a session is specified" do
       controller.current_session.session = Stealth::Session.canonical_session_slug(flow: 'mr_tron', state: 'deprecated_action2')
-      mr_robot_controller = MrTronsController.new(service_message: facebook_message.message_with_text)
+      mr_robot_controller = MrRobotsController.new(service_message: facebook_message.message_with_text)
 
-      expect(MrRobotsController).to receive(:new).and_return(mr_robot_controller)
+      allow(MrRobotsController).to receive(:new).and_return(mr_robot_controller)
       expect(mr_robot_controller).to receive(:my_action)
       controller.action(action: :deprecated_action2)
     end
@@ -156,7 +166,7 @@ describe "Stealth::Controller" do
     it "should call a controller's corresponding action when only a state is provided" do
       expect_any_instance_of(MrTronsController).to receive(:other_action3)
 
-      controller.current_session.set(flow: 'mr_tron', state: 'other_action')
+      controller.current_session.set_session(new_flow: 'mr_tron', new_state: 'other_action')
 
       controller.step_to state: "other_action3"
     end
@@ -175,10 +185,44 @@ describe "Stealth::Controller" do
       controller.step_to session: controller.current_session
     end
 
+    it "should call a controller's corresponding action when a session slug is provided" do
+      expect_any_instance_of(MrRobotsController).to receive(:my_action3)
+      controller.step_to slug: 'mr_robot->my_action3'
+    end
+
+    it "should pass along the service_message" do
+      robot_controller_dbl = double('MrRobotsController').as_null_object
+      expect(MrRobotsController).to receive(:new).with(service_message: controller.current_message, pos: nil).and_return(robot_controller_dbl)
+      controller.step_to flow: :mr_robot, state: :my_action3
+    end
+
     it "should accept flow and string specified as symbols" do
       expect_any_instance_of(MrRobotsController).to receive(:my_action3)
       controller.step_to flow: :mr_robot, state: :my_action3
     end
+
+    it "should check if an interruption occured" do
+      expect(controller).to receive(:interrupt_detected?).and_return(false)
+      controller.step_to flow: :mr_robot, state: :my_action3
+    end
+
+    it "should call run_interrupt_action if an interruption occured and return" do
+      expect(controller).to receive(:interrupt_detected?).and_return(true)
+      expect(controller).to receive(:run_interrupt_action)
+      expect(controller.step_to(flow: :mr_robot, state: :my_action3)).to eq :interrupted
+    end
+
+    it "should set @pos if it is specified in the arguments" do
+      expect_any_instance_of(MrRobotsController).to receive(:my_action3)
+      controller.step_to flow: :mr_robot, state: :my_action3, pos: -1
+      expect(controller.pos).to eq -1
+    end
+
+    it "should leave @pos as nil if the pos argument is not specified" do
+      expect_any_instance_of(MrRobotsController).to receive(:my_action3)
+      controller.step_to flow: :mr_robot, state: :my_action3
+      expect(controller.pos).to be_nil
+    end
   end
 
   describe "update_session_to" do
@@ -199,7 +243,7 @@ describe "Stealth::Controller" do
     it "should update session to controller's corresponding action when only a state is provided" do
       expect_any_instance_of(MrTronsController).to_not receive(:other_action3)
 
-      controller.current_session.set(flow: 'mr_tron', state: 'other_action')
+      controller.current_session.set_session(new_flow: 'mr_tron', new_state: 'other_action')
 
       controller.update_session_to state: "other_action3"
       expect(controller.current_session.flow_string).to eq('mr_tron')
@@ -217,14 +261,22 @@ describe "Stealth::Controller" do
     it "should update session to controller's corresponding action when a session is provided" do
       expect_any_instance_of(MrRobotsController).to_not receive(:my_action3)
 
-      session = Stealth::Session.new(user_id: controller.current_session_id)
-      session.set(flow: 'mr_robot', state: 'my_action3')
+      session = Stealth::Session.new(id: controller.current_session_id)
+      session.set_session(new_flow: 'mr_robot', new_state: 'my_action3')
 
       controller.update_session_to session: session
       expect(controller.current_session.flow_string).to eq('mr_robot')
       expect(controller.current_session.state_string).to eq('my_action3')
     end
 
+    it "should update session to controller's corresponding action when a session slug is provided" do
+      expect_any_instance_of(MrRobotsController).to_not receive(:my_action3)
+      expect(controller.current_session.flow_string).to eq('mr_robot')
+      expect(controller.current_session.state_string).to eq('my_action3')
+
+      controller.update_session_to slug: 'mr_robot->my_action3'
+    end
+
     it "should accept flow and string specified as symbols" do
       expect_any_instance_of(MrRobotsController).to_not receive(:my_action3)
 
@@ -232,6 +284,17 @@ describe "Stealth::Controller" do
       expect(controller.current_session.flow_string).to eq('mr_robot')
       expect(controller.current_session.state_string).to eq('my_action3')
     end
+
+    it "should check if an interruption occured" do
+      expect(controller).to receive(:interrupt_detected?).and_return(false)
+      controller.update_session_to flow: :mr_robot, state: :my_action3
+    end
+
+    it "should call run_interrupt_action if an interruption occured and return" do
+      expect(controller).to receive(:interrupt_detected?).and_return(true)
+      expect(controller).to receive(:run_interrupt_action)
+      expect(controller.update_session_to(flow: :mr_robot, state: :my_action3)).to eq :interrupted
+    end
   end
 
   describe "step_to_in" do
@@ -255,30 +318,32 @@ describe "Stealth::Controller" do
         controller.current_service,
         controller.current_session_id,
         'mr_robot',
-        'my_action'
+        'my_action',
+        nil
       )
 
       expect {
         controller.step_to_in 100.seconds, flow: "mr_robot"
-      }.to_not change(controller.current_session, :get)
+      }.to_not change(controller.current_session, :get_session)
     end
 
     it "should schedule a transition to controller's corresponding action when only a state is provided" do
       expect_any_instance_of(MrRobotsController).to_not receive(:my_action)
 
-      controller.current_session.set(flow: 'mr_tron', state: 'other_action')
+      controller.current_session.set_session(new_flow: 'mr_tron', new_state: 'other_action')
 
       expect(Stealth::ScheduledReplyJob).to receive(:perform_in).with(
         100.seconds,
         controller.current_service,
         controller.current_session_id,
         'mr_tron',
-        'other_action3'
+        'other_action3',
+        nil
       )
 
       expect {
         controller.step_to_in 100.seconds, state: "other_action3"
-      }.to_not change(controller.current_session, :get)
+      }.to_not change(controller.current_session, :get_session)
     end
 
     it "should update session to controller's corresponding action when a state and flow is provided" do
@@ -289,31 +354,50 @@ describe "Stealth::Controller" do
         controller.current_service,
         controller.current_session_id,
         'mr_robot',
-        'my_action3'
+        'my_action3',
+        nil
       )
 
       expect {
         controller.step_to_in 100.seconds, flow: 'mr_robot', state: "my_action3"
-      }.to_not change(controller.current_session, :get)
+      }.to_not change(controller.current_session, :get_session)
     end
 
     it "should update session to controller's corresponding action when a session is provided" do
       expect_any_instance_of(MrRobotsController).to_not receive(:my_action)
 
-      session = Stealth::Session.new(user_id: controller.current_session_id)
-      session.set(flow: 'mr_robot', state: 'my_action3')
+      session = Stealth::Session.new(id: controller.current_session_id)
+      session.set_session(new_flow: 'mr_robot', new_state: 'my_action3')
 
       expect(Stealth::ScheduledReplyJob).to receive(:perform_in).with(
         100.seconds,
         controller.current_service,
         controller.current_session_id,
         'mr_robot',
-        'my_action3'
+        'my_action3',
+        nil
       )
 
       expect {
         controller.step_to_in 100.seconds, session: session
-      }.to_not change(controller.current_session, :get)
+      }.to_not change(controller.current_session, :get_session)
+    end
+
+    it "should update session to controller's corresponding action when a session slug is provided" do
+      expect_any_instance_of(MrRobotsController).to_not receive(:my_action)
+
+      expect(Stealth::ScheduledReplyJob).to receive(:perform_in).with(
+        100.seconds,
+        controller.current_service,
+        controller.current_session_id,
+        'mr_robot',
+        'my_action3',
+        nil
+      )
+
+      expect {
+        controller.step_to_in 100.seconds, slug: 'mr_robot->my_action3'
+      }.to_not change(controller.current_session, :get_session)
     end
 
     it "should accept flow and string specified as symbols" do
@@ -324,12 +408,38 @@ describe "Stealth::Controller" do
         controller.current_service,
         controller.current_session_id,
         'mr_robot',
-        'my_action3'
+        'my_action3',
+        nil
       )
 
       expect {
         controller.step_to_in 100.seconds, flow: :mr_robot, state: :my_action3
-      }.to_not change(controller.current_session, :get)
+      }.to_not change(controller.current_session, :get_session)
+    end
+
+    it "should pass along the target_id if set on the message" do
+      expect(Stealth::ScheduledReplyJob).to receive(:perform_in).with(
+        100.seconds,
+        controller.current_service,
+        controller.current_session_id,
+        'mr_robot',
+        'my_action3',
+        '+18885551212'
+      )
+
+      controller.current_message.target_id = '+18885551212'
+      controller.step_to_in 100.seconds, flow: :mr_robot, state: :my_action3
+    end
+
+    it "should check if an interruption occured" do
+      expect(controller).to receive(:interrupt_detected?).and_return(false)
+      controller.step_to_in 100.seconds, flow: :mr_robot, state: :my_action3
+    end
+
+    it "should call run_interrupt_action if an interruption occured and return" do
+      expect(controller).to receive(:interrupt_detected?).and_return(true)
+      expect(controller).to receive(:run_interrupt_action)
+      expect(controller.step_to_in(100.seconds, flow: :mr_robot, state: :my_action3)).to eq :interrupted
     end
   end
 
@@ -356,30 +466,32 @@ describe "Stealth::Controller" do
         controller.current_service,
         controller.current_session_id,
         'mr_robot',
-        'my_action'
+        'my_action',
+        nil
       )
 
       expect {
         controller.step_to_at future_timestamp, flow: "mr_robot"
-      }.to_not change(controller.current_session, :get)
+      }.to_not change(controller.current_session, :get_session)
     end
 
     it "should schedule a transition to controller's corresponding action when only a state is provided" do
       expect_any_instance_of(MrRobotsController).to_not receive(:my_action)
 
-      controller.current_session.set(flow: 'mr_tron', state: 'other_action')
+      controller.current_session.set_session(new_flow: 'mr_tron', new_state: 'other_action')
 
       expect(Stealth::ScheduledReplyJob).to receive(:perform_at).with(
         future_timestamp,
         controller.current_service,
         controller.current_session_id,
         'mr_tron',
-        'other_action3'
+        'other_action3',
+        nil
       )
 
       expect {
         controller.step_to_at future_timestamp, state: "other_action3"
-      }.to_not change(controller.current_session, :get)
+      }.to_not change(controller.current_session, :get_session)
     end
 
     it "should update session to controller's corresponding action when a state and flow is provided" do
@@ -390,31 +502,50 @@ describe "Stealth::Controller" do
         controller.current_service,
         controller.current_session_id,
         'mr_robot',
-        'my_action3'
+        'my_action3',
+        nil
       )
 
       expect {
         controller.step_to_at future_timestamp, flow: 'mr_robot', state: "my_action3"
-      }.to_not change(controller.current_session, :get)
+      }.to_not change(controller.current_session, :get_session)
     end
 
     it "should update session to controller's corresponding action when a session is provided" do
       expect_any_instance_of(MrRobotsController).to_not receive(:my_action)
 
-      session = Stealth::Session.new(user_id: controller.current_session_id)
-      session.set(flow: 'mr_robot', state: 'my_action3')
+      session = Stealth::Session.new(id: controller.current_session_id)
+      session.set_session(new_flow: 'mr_robot', new_state: 'my_action3')
 
       expect(Stealth::ScheduledReplyJob).to receive(:perform_at).with(
         future_timestamp,
         controller.current_service,
         controller.current_session_id,
         'mr_robot',
-        'my_action3'
+        'my_action3',
+        nil
       )
 
       expect {
         controller.step_to_at future_timestamp, session: session
-      }.to_not change(controller.current_session, :get)
+      }.to_not change(controller.current_session, :get_session)
+    end
+
+    it "should update session to controller's corresponding action when a session slug is provided" do
+      expect_any_instance_of(MrRobotsController).to_not receive(:my_action)
+
+      expect(Stealth::ScheduledReplyJob).to receive(:perform_at).with(
+        future_timestamp,
+        controller.current_service,
+        controller.current_session_id,
+        'mr_robot',
+        'my_action3',
+        nil
+      )
+
+      expect {
+        controller.step_to_at future_timestamp, slug: 'mr_robot->my_action3'
+      }.to_not change(controller.current_session, :get_session)
     end
 
     it "should accept flow and string specified as symbols" do
@@ -425,12 +556,148 @@ describe "Stealth::Controller" do
         controller.current_service,
         controller.current_session_id,
         'mr_robot',
-        'my_action3'
+        'my_action3',
+        nil
       )
 
       expect {
         controller.step_to_at future_timestamp, flow: :mr_robot, state: :my_action3
-      }.to_not change(controller.current_session, :get)
+      }.to_not change(controller.current_session, :get_session)
+    end
+
+    it "should pass along the target_id if set on the message" do
+      expect(Stealth::ScheduledReplyJob).to receive(:perform_at).with(
+        future_timestamp,
+        controller.current_service,
+        controller.current_session_id,
+        'mr_robot',
+        'my_action3',
+        '+18885551212'
+      )
+
+      controller.current_message.target_id = '+18885551212'
+      controller.step_to_at future_timestamp, flow: :mr_robot, state: :my_action3
+    end
+
+    it "should check if an interruption occured" do
+      expect(controller).to receive(:interrupt_detected?).and_return(false)
+      controller.step_to_at future_timestamp, flow: :mr_robot, state: :my_action3
+    end
+
+    it "should call run_interrupt_action if an interruption occured and return" do
+      expect(controller).to receive(:interrupt_detected?).and_return(true)
+      expect(controller).to receive(:run_interrupt_action)
+      expect(controller.step_to_at(future_timestamp, flow: :mr_robot, state: :my_action3)).to eq :interrupted
+    end
+  end
+
+  describe "set_back_to" do
+    it "should raise an ArgumentError if a session, flow, or state is not specified" do
+      expect {
+        controller.set_back_to
+      }.to raise_error(ArgumentError)
+    end
+
+    it "should call the flow's first state's controller action when only a flow is provided" do
+      expect {
+        controller.set_back_to(flow: :mr_robot)
+      }.to change{ $redis.get([controller.current_session_id, 'back_to'].join('-')) }.to('mr_robot->my_action')
+    end
+
+    it "should call a controller's corresponding action when only a state is provided" do
+      controller.current_session.set_session(new_flow: 'mr_tron', new_state: 'other_action')
+
+      expect {
+        controller.set_back_to(state: :other_action3)
+      }.to change{ $redis.get([controller.current_session_id, 'back_to'].join('-')) }.to('mr_tron->other_action3')
+    end
+
+    it "should call a controller's corresponding action when a state and flow is provided" do
+      expect {
+        controller.set_back_to(flow: 'marco', state: 'polo')
+      }.to change{ $redis.get([controller.current_session_id, 'back_to'].join('-')) }.to('marco->polo')
+    end
+
+    it "should call a controller's corresponding action when a session is provided" do
+      allow(controller.current_session).to receive(:flow_string).and_return("mr_robot")
+      allow(controller.current_session).to receive(:state_string).and_return("my_action3")
+
+      expect {
+        controller.set_back_to(session: controller.current_session)
+      }.to change{ $redis.get([controller.current_session_id, 'back_to'].join('-')) }.to('mr_robot->my_action3')
+    end
+
+    it "should call a controller's corresponding action when a session slug is provided" do
+      expect {
+        controller.set_back_to(slug: 'marco->polo')
+      }.to change{ $redis.get([controller.current_session_id, 'back_to'].join('-')) }.to('marco->polo')
+    end
+
+    it "should default to the scoped flow if one is not specified" do
+      controller.current_session.set_session(new_flow: :mr_tron, new_state: :other_action)
+      expect {
+        controller.set_back_to(state: 'polo')
+      }.to change{ $redis.get([controller.current_session_id, 'back_to'].join('-')) }.to('mr_tron->polo')
+    end
+
+    it "should overwrite the existing back_to_session if one is already present" do
+      $redis.set([controller.current_session_id, 'back_to'].join('-'), 'marco->polo')
+      controller.current_session.set_session(new_flow: :mr_tron, new_state: :other_action)
+      expect {
+        controller.set_back_to(state: 'other_action')
+      }.to change{ $redis.get([controller.current_session_id, 'back_to'].join('-')) }.from('marco->polo').to('mr_tron->other_action')
+    end
+
+    it "should check if an interruption occured" do
+      expect(controller).to receive(:interrupt_detected?).and_return(false)
+      controller.set_back_to flow: :mr_robot, state: :my_action3
+    end
+
+    it "should call run_interrupt_action if an interruption occured and return" do
+      expect(controller).to receive(:interrupt_detected?).and_return(true)
+      expect(controller).to receive(:run_interrupt_action)
+      expect(controller.set_back_to(flow: :mr_robot, state: :my_action3)).to eq :interrupted
+    end
+  end
+
+  describe "step_back" do
+    let(:back_to_slug) { [controller.current_session_id, 'back_to'].join('-') }
+
+    it "should raise Stealth::Errors::InvalidStateTransition if back_to_session is not set" do
+      $redis.del(back_to_slug)
+      expect {
+        controller.step_back
+      }.to raise_error(Stealth::Errors::InvalidStateTransition)
+    end
+
+    it "should step_to the stored back_to_session" do
+      controller.set_back_to(flow: 'marco', state: 'polo')
+      back_to_session = Stealth::Session.new(
+        id: controller.current_session_id,
+        type: :back_to
+      )
+
+      # We need to control the returned session object so the IDs match
+      expect(Stealth::Session).to receive(:new).with(
+        id: controller.current_session_id,
+        type: :back_to
+      ).and_return(back_to_session)
+      expect(controller).to receive(:step_to).with(session: back_to_session)
+
+      controller.step_back
+    end
+
+    it "should check if an interruption occured" do
+      controller.set_back_to(flow: :mr_robot, state: :my_action3)
+      expect(controller).to receive(:interrupt_detected?).and_return(false)
+      controller.step_back
+    end
+
+    it "should call run_interrupt_action if an interruption occured and return" do
+      controller.set_back_to(flow: :mr_robot, state: :my_action3)
+      expect(controller).to receive(:interrupt_detected?).and_return(true)
+      expect(controller).to receive(:run_interrupt_action)
+      expect(controller.step_back).to eq :interrupted
     end
   end
 
@@ -479,10 +746,144 @@ describe "Stealth::Controller" do
     end
 
     it "should be falsey otherwise" do
+      allow(controller).to receive(:flow_controller).and_return(controller)
       expect(controller.progressed?).to be_falsey
       controller.action(action: :other_action)
       expect(controller.progressed?).to be_falsey
     end
   end
 
+  describe "do_nothing" do
+    it "should set progressed to truthy when called" do
+      allow(controller).to receive(:flow_controller).and_return(controller)
+      expect(controller.progressed?).to be_falsey
+      controller.action(action: :other_action4)
+      expect(controller.progressed?).to be_truthy
+    end
+  end
+
+  describe "update_session" do
+    before(:each) do
+      controller.current_session.set_session(new_flow: 'mr_tron', new_state: 'other_action')
+    end
+
+    it "should set progressed to :updated_session" do
+      controller.send(:update_session, flow: :mr_tron, state: :other_action)
+      expect(controller.progressed?).to eq :updated_session
+    end
+
+    it "call set_session on the current_session with the new flow and state" do
+      controller.send(:update_session, flow: :mr_robot, state: :my_action)
+      expect(controller.current_session.flow_string).to eq 'mr_robot'
+      expect(controller.current_session.state_string).to eq 'my_action'
+    end
+
+    it "should not call set_session on current_session if the flow and state match" do
+      expect_any_instance_of(Stealth::Session).to_not receive(:set_session)
+      controller.send(:update_session, flow: :mr_tron, state: :other_action)
+    end
+  end
+
+  describe "dev jumps" do
+    let!(:dev_env) { ActiveSupport::StringInquirer.new('development') }
+
+    describe "dev_jump_detected?" do
+      it "should return false if the enviornment is not 'development'" do
+        expect(Stealth.env).to eq 'test'
+        expect(controller.send(:dev_jump_detected?)).to be false
+      end
+
+      it "should return false if the message does not match the jump format" do
+        allow(Stealth).to receive(:env).and_return(dev_env)
+        controller.current_message.message = 'hello world'
+        expect(Stealth.env.development?).to be true
+        expect(controller.send(:dev_jump_detected?)).to be false
+      end
+
+      it "should return false if the message looks like an American date" do
+        allow(Stealth).to receive(:env).and_return(dev_env)
+        controller.current_message.message = '1/23/84'
+        expect(Stealth.env.development?).to be true
+        expect(controller.send(:dev_jump_detected?)).to be false
+      end
+
+      it "should return false if the message looks like an American date that is zero padded" do
+        allow(Stealth).to receive(:env).and_return(dev_env)
+        controller.current_message.message = '01/23/1984'
+        expect(Stealth.env.development?).to be true
+        expect(controller.send(:dev_jump_detected?)).to be false
+      end
+
+      describe "with a dev jump message" do
+        before(:each) do
+          expect(controller).to receive(:handle_dev_jump).and_return(true)
+          expect(Stealth).to receive(:env).and_return(dev_env)
+        end
+
+        it "should return true if the message is in the format /flow/state" do
+          controller.current_message.message = '/mr_robot/my_action'
+          expect(controller.send(:dev_jump_detected?)).to be true
+        end
+
+        it "should return true if the message is in the format /flow" do
+          controller.current_message.message = '/mr_robot'
+          expect(controller.send(:dev_jump_detected?)).to be true
+        end
+
+        it "should return true if the message is in the format //state" do
+          controller.current_message.message = '//my_action'
+          expect(controller.send(:dev_jump_detected?)).to be true
+        end
+      end
+    end
+
+    describe "handle_dev_jump" do
+      it "should handle messages in the format /flow/state" do
+        controller.current_message.message = '/mr_robot/my_action'
+        expect(controller).to receive(:step_to).with(flow: 'mr_robot', state: 'my_action')
+        controller.send(:handle_dev_jump)
+      end
+
+      it "should handle messages in the format /flow" do
+        controller.current_message.message = '/mr_robot'
+        expect(controller).to receive(:step_to).with(flow: 'mr_robot', state: nil)
+        controller.send(:handle_dev_jump)
+      end
+
+      it "should handle messages in the format //state" do
+        controller.current_message.message = '//my_action'
+        expect(controller).to receive(:step_to).with(flow: nil, state: 'my_action')
+        controller.send(:handle_dev_jump)
+      end
+    end
+
+    describe "session locking" do
+      before(:each) do
+        allow(MrTronsController).to receive(:new).and_return(controller)
+      end
+
+      it "should lock and then unlock a session when a do_nothing action is called" do
+        expect(controller).to receive(:lock_session!).once
+        expect(controller).to receive(:release_lock!).once
+        controller.action(action: :other_action4)
+      end
+
+      it "should lock and then unlock a session twice when an action steps to another" do
+        expect(controller).to receive(:lock_session!).twice
+        expect(controller).to receive(:release_lock!).twice
+        controller.action(action: :other_action2)
+      end
+
+      it 'should still release the lock even if an action raises' do
+        expect(controller).to receive(:release_lock!).once
+        controller.action(action: :broken_action)
+      end
+
+      it 'should still release the lock if an action steps to an unknown flow->state' do
+        expect(controller).to receive(:release_lock!).once
+        controller.action(action: :parts_unknown)
+      end
+    end
+  end
+
 end