adhearsion 2.5.4 → 2.6.0

data/spec/adhearsion/call_controller/menu_dsl/range_match_calculator_spec.rb

@@ -11,19 +11,19 @@ module Adhearsion
           digits_that_begin_with_eleven = [110..119, 1100..1111].map { |x| Array(x) }.flatten
           calculator = RangeMatchCalculator.new 11..1111, :match_payload_doesnt_matter
           match = calculator.match '11'
-          match.exact_matches.should be == ['11']
-          match.potential_matches.should be == digits_that_begin_with_eleven
+          expect(match.exact_matches).to eq(['11'])
+          expect(match.potential_matches).to eq(digits_that_begin_with_eleven)
         end
 
         it "return values of #match should be an instance of CalculatedMatch" do
           calculator = RangeMatchCalculator.new 1..9, :match_payload_doesnt_matter
-          calculator.match('0').should be_an_instance_of CalculatedMatch
-          calculator.match('1000').should be_an_instance_of CalculatedMatch
+          expect(calculator.match('0')).to be_an_instance_of CalculatedMatch
+          expect(calculator.match('1000')).to be_an_instance_of CalculatedMatch
         end
 
         it "returns a failed match if the query is not numeric or coercible to numeric" do
           calculator = RangeMatchCalculator.new 1..9, :match_payload_doesnt_matter
-          calculator.match("ABC").should be_an_instance_of CalculatedMatch
+          expect(calculator.match("ABC")).to be_an_instance_of CalculatedMatch
         end
       end
 

data/spec/adhearsion/call_controller/menu_dsl/string_match_calculator_spec.rb

@@ -14,14 +14,14 @@ module Adhearsion
             calculator = StringMatchCalculator.new str, match_payload
 
             match_case = calculator.match str[0,2]
-            match_case.should_not be_exact_match
-            match_case.should be_potential_match
-            match_case.potential_matches.should be == [str]
+            expect(match_case).not_to be_exact_match
+            expect(match_case).to be_potential_match
+            expect(match_case.potential_matches).to eq([str])
 
             match_case = calculator.match str
-            match_case.should be_exact_match
-            match_case.should_not be_potential_match
-            match_case.exact_matches.should be == [str]
+            expect(match_case).to be_exact_match
+            expect(match_case).not_to be_potential_match
+            expect(match_case.exact_matches).to eq([str])
           end
         end
 
@@ -29,9 +29,9 @@ module Adhearsion
           %w[* #].each do |special_digit|
             calculator = StringMatchCalculator.new(special_digit, match_payload)
             match_case = calculator.match special_digit
-            match_case.exact_matches.first.should be == special_digit
-            match_case.should be_exact_match
-            match_case.should_not be_potential_match
+            expect(match_case.exact_matches.first).to eq(special_digit)
+            expect(match_case).to be_exact_match
+            expect(match_case).not_to be_potential_match
           end
         end
       end

data/spec/adhearsion/call_controller/output/async_player_spec.rb

@@ -31,21 +31,21 @@ module Adhearsion
           it "returns the component" do
             component = Punchblock::Component::Output.new :ssml => content
             expect_message_waiting_for_response component
-            subject.output(content).should be_a Punchblock::Component::Output
+            expect(subject.output(content)).to be_a Punchblock::Component::Output
           end
 
           it "raises a PlaybackError if the component fails to start" do
             expect_message_waiting_for_response Punchblock::Component::Output.new(:ssml => content), Punchblock::ProtocolError
-            lambda { subject.output content }.should raise_error(PlaybackError)
+            expect { subject.output content }.to raise_error(PlaybackError)
           end
 
           it "logs the complete event if it is an error" do
             response = Punchblock::Event::Complete.new
             response.reason = Punchblock::Event::Complete::Error.new
             component = Punchblock::Component::Output.new(:ssml => content)
-            subject.stub :new_output => component
+            allow(subject).to receive_messages :new_output => component
             expect_message_waiting_for_response component
-            controller.logger.should_receive(:error).once
+            expect(controller.logger).to receive(:error).once
             subject.output content
             component.request!
             component.execute!
@@ -62,6 +62,16 @@ module Adhearsion
             subject.play_ssml ssml
           end
         end
+
+        describe "#play_url" do
+          let(:url) { "http://example.com/ex.ssml" }
+
+          it 'executes an Output with the URL' do
+            component = Punchblock::Component::Output.new({render_document: {value: url, content_type: "application/ssml+xml"}})
+            expect_message_waiting_for_response component
+            subject.play_url url
+          end
+        end
       end
     end
   end

data/spec/adhearsion/call_controller/output/formatter_spec.rb

@@ -15,11 +15,11 @@ module Adhearsion
           end
 
           it 'returns SSML for a text argument' do
-            subject.ssml_for(prompt).should be == ssml
+            expect(subject.ssml_for(prompt)).to eq(ssml)
           end
 
           it 'returns the same SSML passed in if it is SSML' do
-            subject.ssml_for(ssml).should be == ssml
+            expect(subject.ssml_for(ssml)).to eq(ssml)
           end
         end
 
@@ -39,60 +39,60 @@ module Adhearsion
           end
 
           it "should create a composite SSML document" do
-            subject.ssml_for_collection(collection).should be == ssml
+            expect(subject.ssml_for_collection(collection)).to eq(ssml)
           end
         end
 
         describe "#detect_type" do
           it "detects an HTTP path" do
             http_path = "http://adhearsion.com/sounds/hello.mp3"
-            subject.detect_type(http_path).should be :audio
+            expect(subject.detect_type(http_path)).to be :audio
           end
 
           it "detects a file path" do
             file_path = "file:///usr/shared/sounds/hello.mp3"
-            subject.detect_type(file_path).should be :audio
+            expect(subject.detect_type(file_path)).to be :audio
 
             absolute_path = "/usr/shared/sounds/hello.mp3"
-            subject.detect_type(absolute_path).should be :audio
+            expect(subject.detect_type(absolute_path)).to be :audio
 
             relative_path = "foo/bar"
-            subject.detect_type(relative_path).should_not be :audio
+            expect(subject.detect_type(relative_path)).not_to be :audio
           end
 
           it "detects a Date object" do
             today = Date.today
-            subject.detect_type(today).should be :time
+            expect(subject.detect_type(today)).to be :time
           end
 
           it "detects a Time object" do
             now = Time.now
-            subject.detect_type(now).should be :time
+            expect(subject.detect_type(now)).to be :time
           end
 
           it "detects a DateTime object" do
             today = DateTime.now
-            subject.detect_type(today).should be :time
+            expect(subject.detect_type(today)).to be :time
           end
 
           it "detects a Numeric object" do
             number = 123
-            subject.detect_type(number).should be :numeric
+            expect(subject.detect_type(number)).to be :numeric
           end
 
           it "detects a String of digits" do
             number = '123'
-            subject.detect_type(number).should be :numeric
+            expect(subject.detect_type(number)).to be :numeric
           end
 
           it "detects a String of characters" do
             number = '123#'
-            subject.detect_type(number).should be :characters
+            expect(subject.detect_type(number)).to be :characters
           end
 
           ["Foo", "Foo bar", "The answer: foo", "The answer could be foo/bar"].each do |string|
             it "detects '#{string}' as text" do
-              subject.detect_type(string).should be :text
+              expect(subject.detect_type(string)).to be :text
             end
           end
         end

data/spec/adhearsion/call_controller/output/player_spec.rb

@@ -30,7 +30,7 @@ module Adhearsion
           it "yields the component to the block before waiting for it to finish" do
             component = Punchblock::Component::Output.new :ssml => content
 
-            controller.should_receive(:execute_component_and_await_completion).once.with(component).and_yield(:foo)
+            expect(controller).to receive(:execute_component_and_await_completion).once.with(component).and_yield(:foo)
 
             @foo = nil
 
@@ -38,22 +38,22 @@ module Adhearsion
               @foo = comp
             end
 
-            @foo.should == :foo
+            expect(@foo).to eq(:foo)
           end
 
           it "raises a PlaybackError if the component fails to start" do
             expect_component_execution Punchblock::Component::Output.new(:ssml => content), Punchblock::ProtocolError
-            lambda { subject.output content }.should raise_error(PlaybackError)
+            expect { subject.output content }.to raise_error(PlaybackError)
           end
 
           it "raises a Playback Error if the component ends due to an error" do
             expect_component_execution Punchblock::Component::Output.new(:ssml => content), Adhearsion::Error
-            lambda { subject.output content }.should raise_error(PlaybackError)
+            expect { subject.output content }.to raise_error(PlaybackError)
           end
 
           it "raises a Call::Hangup exception if the component ends due to an error" do
             expect_component_execution Punchblock::Component::Output.new(:ssml => content), Call::Hangup
-            lambda { subject.output content }.should raise_error(Call::Hangup)
+            expect { subject.output content }.to raise_error(Call::Hangup)
           end
         end
 
@@ -65,6 +65,16 @@ module Adhearsion
             subject.play_ssml ssml
           end
         end
+
+        describe "#play_url" do
+          let(:url) { "http://example.com/ex.ssml" }
+
+          it 'executes an Output with the URL' do
+            component = Punchblock::Component::Output.new({render_document: {value: url, content_type: "application/ssml+xml"}})
+            expect_component_execution component
+            subject.play_url url
+          end
+        end
       end
     end
   end

data/spec/adhearsion/call_controller/output_spec.rb

@@ -16,19 +16,29 @@ module Adhearsion
         expect_message_waiting_for_response Punchblock::Component::Output.new(options.merge(:ssml => ssml))
       end
 
+      def expect_url_output(url, options = {})
+        component = Punchblock::Component::Output.new(options.merge(render_document: {value: url, content_type: "application/ssml+xml"}))
+        expect_component_execution component
+      end
+
+      def expect_async_url_output(url, options = {})
+        component = Punchblock::Component::Output.new(options.merge(render_document: {value: url, content_type: "application/ssml+xml"}))
+        expect_message_waiting_for_response component
+      end
+
       describe "#player" do
         it "should return a Player component targetted at the current controller" do
           player = controller.player
-          player.should be_a Output::Player
-          player.controller.should be controller
+          expect(player).to be_a Output::Player
+          expect(player.controller).to be controller
         end
       end
 
       describe "#async_player" do
         it "should return an AsyncPlayer component targetted at the current controller" do
           player = controller.async_player
-          player.should be_a Output::AsyncPlayer
-          player.controller.should be controller
+          expect(player).to be_a Output::AsyncPlayer
+          expect(player.controller).to be controller
         end
       end
 
@@ -42,7 +52,7 @@ module Adhearsion
 
         it 'plays the correct ssml' do
           expect_ssml_output ssml
-          subject.play_audio(audio_file).should be true
+          expect(subject.play_audio(audio_file)).to be true
         end
 
         context "with a fallback" do
@@ -58,7 +68,7 @@ module Adhearsion
 
           it 'places the fallback in the SSML doc' do
             expect_ssml_output ssml
-            subject.play_audio(audio_file, :fallback => fallback).should be true
+            expect(subject.play_audio(audio_file, :fallback => fallback)).to be true
           end
         end
 
@@ -66,7 +76,7 @@ module Adhearsion
           let(:media_engine) { :native }
           it "should use the specified media engine in the component" do
             expect_ssml_output ssml, renderer: media_engine
-            subject.play_audio(audio_file, renderer: media_engine).should be true
+            expect(subject.play_audio(audio_file, renderer: media_engine)).to be true
           end
         end
       end
@@ -81,7 +91,7 @@ module Adhearsion
 
         it 'plays the correct ssml' do
           expect_async_ssml_output ssml
-          subject.play_audio!(audio_file).should be_a Punchblock::Component::Output
+          expect(subject.play_audio!(audio_file)).to be_a Punchblock::Component::Output
         end
 
         context "with a fallback" do
@@ -97,7 +107,7 @@ module Adhearsion
 
           it 'places the fallback in the SSML doc' do
             expect_async_ssml_output ssml
-            subject.play_audio!(audio_file, :fallback => fallback).should be_a Punchblock::Component::Output
+            expect(subject.play_audio!(audio_file, :fallback => fallback)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -105,7 +115,7 @@ module Adhearsion
           let(:media_engine) { :native }
           it "should use the specified media engine in the SSML" do
             expect_async_ssml_output ssml, renderer: media_engine
-            subject.play_audio!(audio_file, renderer: media_engine).should be_a Punchblock::Component::Output
+            expect(subject.play_audio!(audio_file, renderer: media_engine)).to be_a Punchblock::Component::Output
           end
         end
       end
@@ -122,7 +132,7 @@ module Adhearsion
 
           it 'plays the correct ssml' do
             expect_ssml_output ssml
-            subject.play_numeric(input).should be true
+            expect(subject.play_numeric(input)).to be true
           end
         end
 
@@ -131,7 +141,7 @@ module Adhearsion
 
           it 'plays the correct ssml' do
             expect_ssml_output ssml
-            subject.play_numeric(input).should be true
+            expect(subject.play_numeric(input)).to be true
           end
         end
 
@@ -139,7 +149,7 @@ module Adhearsion
           let(:input) { 'foo' }
 
           it 'raises ArgumentError' do
-            lambda { subject.play_numeric input }.should raise_error(ArgumentError)
+            expect { subject.play_numeric input }.to raise_error(ArgumentError)
           end
         end
 
@@ -149,7 +159,7 @@ module Adhearsion
 
           it "should use the specified renderer in the SSML" do
             expect_ssml_output ssml, renderer: renderer
-            subject.play_numeric(input, renderer: renderer).should be true
+            expect(subject.play_numeric(input, renderer: renderer)).to be true
           end
         end
       end
@@ -166,7 +176,7 @@ module Adhearsion
 
           it 'plays the correct ssml' do
             expect_async_ssml_output ssml
-            subject.play_numeric!(input).should be_a Punchblock::Component::Output
+            expect(subject.play_numeric!(input)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -175,7 +185,7 @@ module Adhearsion
 
           it 'plays the correct ssml' do
             expect_async_ssml_output ssml
-            subject.play_numeric!(input).should be_a Punchblock::Component::Output
+            expect(subject.play_numeric!(input)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -183,7 +193,7 @@ module Adhearsion
           let(:input) { 'foo' }
 
           it 'raises ArgumentError' do
-            lambda { subject.play_numeric! input }.should raise_error(ArgumentError)
+            expect { subject.play_numeric! input }.to raise_error(ArgumentError)
           end
         end
 
@@ -193,7 +203,45 @@ module Adhearsion
 
           it "should use the specified renderer in the SSML" do
             expect_async_ssml_output ssml, renderer: renderer
-            subject.play_numeric!(input, renderer: renderer).should be_a Punchblock::Component::Output
+            expect(subject.play_numeric!(input, renderer: renderer)).to be_a Punchblock::Component::Output
+          end
+        end
+      end
+
+      describe "#play_document" do
+        describe "with a URL" do
+          let(:input) { 'http://example.com/ex.ssml' }
+
+          it 'plays the url' do
+            expect_url_output input
+            expect(subject.play_document(input)).to be true
+          end
+        end
+
+        describe "with something that's not a URL" do
+          let(:input) { 'ceci n\'est pas une url' }
+
+          it 'raises ArgumentError' do
+            expect { subject.play_document input }.to raise_error(ArgumentError)
+          end
+        end
+      end
+
+      describe "#play_document!" do
+        describe "with a URL" do
+          let(:input) { 'http://example.com/ex.ssml' }
+
+          it 'plays the url' do
+            expect_async_url_output input
+            expect(subject.play_document!(input)).to be_a Punchblock::Component::Output
+          end
+        end
+
+        describe "with something that's not a URL" do
+          let(:input) { 'ceci n\'est pas une url' }
+
+          it 'raises ArgumentError' do
+            expect { subject.play_document! input }.to raise_error(ArgumentError)
           end
         end
       end
@@ -213,7 +261,7 @@ module Adhearsion
 
           it 'plays the correct SSML' do
             expect_ssml_output ssml
-            subject.play_time(input).should be true
+            expect(subject.play_time(input)).to be true
           end
         end
 
@@ -223,7 +271,7 @@ module Adhearsion
 
           it 'plays the correct SSML' do
             expect_ssml_output ssml
-            subject.play_time(input).should be true
+            expect(subject.play_time(input)).to be true
           end
         end
 
@@ -234,7 +282,7 @@ module Adhearsion
 
           it 'plays the correct SSML' do
             expect_ssml_output ssml
-            subject.play_time(input, :format => format).should be true
+            expect(subject.play_time(input, :format => format)).to be true
           end
         end
 
@@ -246,7 +294,7 @@ module Adhearsion
 
           it 'plays the correct SSML' do
             expect_ssml_output ssml
-            subject.play_time(base_input, :strftime => strftime).should be true
+            expect(subject.play_time(base_input, :strftime => strftime)).to be true
           end
         end
 
@@ -259,7 +307,7 @@ module Adhearsion
 
           it 'plays the correct SSML' do
             expect_ssml_output ssml
-            subject.play_time(base_input, :format => format, :strftime => strftime).should be true
+            expect(subject.play_time(base_input, :format => format, :strftime => strftime)).to be true
           end
         end
 
@@ -271,7 +319,7 @@ module Adhearsion
 
           it "should use the specified renderer in the SSML" do
             expect_ssml_output ssml, renderer: renderer
-            subject.play_time(input, format: format, renderer: renderer).should be true
+            expect(subject.play_time(input, format: format, renderer: renderer)).to be true
           end
         end
 
@@ -279,7 +327,7 @@ module Adhearsion
           let(:input) { "foo" }
 
           it 'raises ArgumentError' do
-            lambda { subject.play_time input }.should raise_error(ArgumentError)
+            expect { subject.play_time input }.to raise_error(ArgumentError)
           end
         end
       end
@@ -299,7 +347,7 @@ module Adhearsion
 
           it 'plays the correct SSML' do
             expect_async_ssml_output ssml
-            subject.play_time!(input).should be_a Punchblock::Component::Output
+            expect(subject.play_time!(input)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -309,7 +357,7 @@ module Adhearsion
 
           it 'plays the correct SSML' do
             expect_async_ssml_output ssml
-            subject.play_time!(input).should be_a Punchblock::Component::Output
+            expect(subject.play_time!(input)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -320,7 +368,7 @@ module Adhearsion
 
           it 'plays the correct SSML' do
             expect_async_ssml_output ssml
-            subject.play_time!(input, :format => format).should be_a Punchblock::Component::Output
+            expect(subject.play_time!(input, :format => format)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -332,7 +380,7 @@ module Adhearsion
 
           it 'plays the correct SSML' do
             expect_async_ssml_output ssml
-            subject.play_time!(base_input, :strftime => strftime).should be_a Punchblock::Component::Output
+            expect(subject.play_time!(base_input, :strftime => strftime)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -345,7 +393,7 @@ module Adhearsion
 
           it 'plays the correct SSML' do
             expect_async_ssml_output ssml
-            subject.play_time!(base_input, :format => format, :strftime => strftime).should be_a Punchblock::Component::Output
+            expect(subject.play_time!(base_input, :format => format, :strftime => strftime)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -357,7 +405,7 @@ module Adhearsion
 
           it "should use the specified renderer in the SSML" do
             expect_async_ssml_output ssml, renderer: renderer
-            subject.play_time!(input, format: format, renderer: renderer).should be_a Punchblock::Component::Output
+            expect(subject.play_time!(input, format: format, renderer: renderer)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -365,7 +413,7 @@ module Adhearsion
           let(:input) { "foo" }
 
           it 'raises ArgumentError' do
-            lambda { subject.play_time! input }.should raise_error(ArgumentError)
+            expect { subject.play_time! input }.to raise_error(ArgumentError)
           end
         end
       end
@@ -390,12 +438,12 @@ module Adhearsion
 
           it 'plays the audio file' do
             expect_ssml_output ssml
-            subject.play(audio_file).should be true
+            expect(subject.play(audio_file)).to be true
           end
 
           it 'plays the audio file with the specified extra options if present' do
             expect_ssml_output ssml, extra_options
-            subject.play(audio_file, extra_options).should be true
+            expect(subject.play(audio_file, extra_options)).to be true
           end
         end
 
@@ -416,13 +464,13 @@ module Adhearsion
 
           it 'plays all arguments in one document' do
             expect_ssml_output ssml
-            subject.play(*args).should be true
+            expect(subject.play(*args)).to be true
           end
 
           it 'plays all arguments in one document with the extra options if present' do
             expect_ssml_output ssml, extra_options
             args << extra_options
-            subject.play(*args).should be true
+            expect(subject.play(*args)).to be true
           end
         end
 
@@ -441,7 +489,7 @@ module Adhearsion
 
           it 'plays all arguments in one document' do
             expect_ssml_output ssml
-            subject.play(args).should be true
+            expect(subject.play(args)).to be true
           end
 
           context "that is empty" do
@@ -463,7 +511,7 @@ module Adhearsion
 
           it 'plays the number' do
             expect_ssml_output ssml
-            subject.play(argument).should be true
+            expect(subject.play(argument)).to be true
           end
         end
 
@@ -479,7 +527,7 @@ module Adhearsion
 
           it 'plays the number' do
             expect_ssml_output ssml
-            subject.play(argument).should be true
+            expect(subject.play(argument)).to be true
           end
         end
 
@@ -495,7 +543,7 @@ module Adhearsion
 
           it 'plays the time' do
             expect_ssml_output ssml
-            subject.play(time).should be true
+            expect(subject.play(time)).to be true
           end
         end
 
@@ -510,7 +558,7 @@ module Adhearsion
 
           it 'plays the time' do
             expect_ssml_output ssml
-            subject.play(date).should be true
+            expect(subject.play(date)).to be true
           end
         end
 
@@ -529,7 +577,7 @@ module Adhearsion
 
           it 'plays the time with the specified format and strftime' do
             expect_ssml_output ssml
-            subject.play(:value => date, :format => format, :strftime => strftime).should be true
+            expect(subject.play(:value => date, :format => format, :strftime => strftime)).to be true
           end
         end
 
@@ -538,7 +586,7 @@ module Adhearsion
 
           it "plays the SSML without generating" do
             expect_ssml_output ssml
-            subject.play(ssml).should be true
+            expect(subject.play(ssml)).to be true
           end
         end
       end
@@ -563,7 +611,7 @@ module Adhearsion
 
           it 'plays the audio file' do
             expect_async_ssml_output ssml
-            subject.play!(audio_file).should be_a Punchblock::Component::Output
+            expect(subject.play!(audio_file)).to be_a Punchblock::Component::Output
           end
 
           it 'plays the audio file with the specified extra options if present' do
@@ -587,7 +635,7 @@ module Adhearsion
 
           it 'plays all arguments in one document' do
             expect_async_ssml_output ssml
-            subject.play!(*args).should be_a Punchblock::Component::Output
+            expect(subject.play!(*args)).to be_a Punchblock::Component::Output
           end
 
           it 'plays all arguments in one document with the extra options if present' do
@@ -609,7 +657,7 @@ module Adhearsion
 
           it 'plays the number' do
             expect_async_ssml_output ssml
-            subject.play!(argument).should be_a Punchblock::Component::Output
+            expect(subject.play!(argument)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -625,7 +673,7 @@ module Adhearsion
 
           it 'plays the number' do
             expect_async_ssml_output ssml
-            subject.play!(argument).should be_a Punchblock::Component::Output
+            expect(subject.play!(argument)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -641,7 +689,7 @@ module Adhearsion
 
           it 'plays the time' do
             expect_async_ssml_output ssml
-            subject.play!(time).should be_a Punchblock::Component::Output
+            expect(subject.play!(time)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -656,7 +704,7 @@ module Adhearsion
 
           it 'plays the time' do
             expect_async_ssml_output ssml
-            subject.play!(date).should be_a Punchblock::Component::Output
+            expect(subject.play!(date)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -675,7 +723,7 @@ module Adhearsion
 
           it 'plays the time with the specified format and strftime' do
             expect_async_ssml_output ssml
-            subject.play!(:value => date, :format => format, :strftime => strftime).should be_a Punchblock::Component::Output
+            expect(subject.play!(:value => date, :format => format, :strftime => strftime)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -684,7 +732,7 @@ module Adhearsion
 
           it "plays the SSML without generating" do
             expect_async_ssml_output ssml
-            subject.play!(ssml).should be_a Punchblock::Component::Output
+            expect(subject.play!(ssml)).to be_a Punchblock::Component::Output
           end
         end
       end
@@ -696,26 +744,26 @@ module Adhearsion
         let(:extra_options) { {renderer: :native } }
 
         it "plays two outputs in succession" do
-          subject.should_receive(:stream_file).twice
+          expect(subject).to receive(:stream_file).twice
           digit = subject.interruptible_play output1, output2
-          digit.should be_nil
+          expect(digit).to be_nil
         end
 
         it "stops at the first play when input is received" do
-          subject.should_receive(:stream_file).once.and_return(2)
+          expect(subject).to receive(:stream_file).once.and_return(2)
           digit = subject.interruptible_play output1, output2
-          digit.should be == 2
+          expect(digit).to eq(2)
         end
 
         it "passes options on to #stream_file" do
-          subject.should_receive(:stream_file).once.with(output1, '0123456789#*', extra_options)
-          subject.should_receive(:stream_file).once.with(output2, '0123456789#*', extra_options)
+          expect(subject).to receive(:stream_file).once.with(output1, '0123456789#*', extra_options)
+          expect(subject).to receive(:stream_file).once.with(output2, '0123456789#*', extra_options)
           digit = subject.interruptible_play output1, output2, extra_options
-          digit.should be_nil
+          expect(digit).to be_nil
         end
 
         it 'raises an exception when output is unsuccessful' do
-          subject.should_receive(:stream_file).once.and_raise Output::PlaybackError, "Output failed"
+          expect(subject).to receive(:stream_file).once.and_raise Output::PlaybackError, "Output failed"
           expect { subject.interruptible_play non_existing }.to raise_error(Output::PlaybackError)
         end
       end
@@ -755,7 +803,7 @@ module Adhearsion
 
         #test does pass and method works, but not sure if the empty method is a good idea
         it "plays the correct output" do
-          controller.stub(:write_and_await_response)
+          allow(controller).to receive(:write_and_await_response)
 
           expect_component_complete_event
           expect_component_execution Punchblock::Component::Output.new(:ssml => ssml)
@@ -763,23 +811,23 @@ module Adhearsion
         end
 
         it "returns a single digit amongst the allowed when pressed" do
-          controller.should_receive(:write_and_await_response).with(kind_of(Punchblock::Component::Input)) do |input_component|
+          expect(controller).to receive(:write_and_await_response).with(kind_of(Punchblock::Component::Input)) do |input_component|
             input_component.trigger_event_handler Punchblock::Event::Complete.new
           end
 
-          controller.should_receive(:write_and_await_response).once.with(kind_of(Punchblock::Component::Output))
+          expect(controller).to receive(:write_and_await_response).once.with(kind_of(Punchblock::Component::Output))
 
-          Punchblock::Component::Output.any_instance.should_receive(:stop!)
-          Punchblock::Component::Output.any_instance.should_receive(:complete_event).and_return double('complete', reason: double('Reason'))
+          expect_any_instance_of(Punchblock::Component::Output).to receive(:stop!)
+          expect_any_instance_of(Punchblock::Component::Output).to receive(:complete_event).and_return double('complete', reason: double('Reason'))
           expect_input_component_complete_event 'dtmf-5'
 
-          subject.stream_file(prompt, allowed_digits).should be == '5'
+          expect(subject.stream_file(prompt, allowed_digits)).to eq('5')
         end
 
         context "with output options passed in" do
           let(:extra_options) { {renderer: :native } }
           it "plays the correct output with options" do
-            controller.stub(:write_and_await_response)
+            allow(controller).to receive(:write_and_await_response)
 
             expect_component_complete_event
             expect_component_execution Punchblock::Component::Output.new({:ssml => ssml}.merge(extra_options))
@@ -799,7 +847,7 @@ module Adhearsion
           it 'plays the correct SSML' do
             ssml = RubySpeech::SSML.draw { string "Hello world" }
             expect_ssml_output ssml
-            subject.say(ssml).should be_a Punchblock::Component::Output
+            expect(subject.say(ssml)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -808,7 +856,7 @@ module Adhearsion
             str = "Hello world"
             ssml = RubySpeech::SSML.draw { string str }
             expect_ssml_output ssml
-            subject.say(str).should be_a Punchblock::Component::Output
+            expect(subject.say(str)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -881,14 +929,14 @@ module Adhearsion
             argument = 123
             ssml = RubySpeech::SSML.draw { string '123' }
             expect_ssml_output ssml
-            subject.say(argument).should be_a Punchblock::Component::Output
+            expect(subject.say(argument)).to be_a Punchblock::Component::Output
           end
         end
       end
 
       describe "#speak" do
         it "should be an alias for #say" do
-          subject.method(:speak).should be == subject.method(:say)
+          expect(subject.method(:speak)).to eq(subject.method(:say))
         end
       end
 
@@ -903,7 +951,7 @@ module Adhearsion
           it 'plays the correct SSML' do
             ssml = RubySpeech::SSML.draw { string "Hello world" }
             expect_async_ssml_output ssml
-            subject.say!(ssml).should be_a Punchblock::Component::Output
+            expect(subject.say!(ssml)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -912,7 +960,7 @@ module Adhearsion
             str = "Hello world"
             ssml = RubySpeech::SSML.draw { string str }
             expect_async_ssml_output ssml
-            subject.say!(str).should be_a Punchblock::Component::Output
+            expect(subject.say!(str)).to be_a Punchblock::Component::Output
           end
         end
 
@@ -985,14 +1033,14 @@ module Adhearsion
             argument = 123
             ssml = RubySpeech::SSML.draw { string '123' }
             expect_async_ssml_output ssml
-            subject.say!(argument).should be_a Punchblock::Component::Output
+            expect(subject.say!(argument)).to be_a Punchblock::Component::Output
           end
         end
       end
 
       describe "#speak!" do
         it "should be an alias for #say!" do
-          subject.method(:speak!).should be == subject.method(:say!)
+          expect(subject.method(:speak!)).to eq(subject.method(:say!))
         end
       end
 
@@ -1006,7 +1054,7 @@ module Adhearsion
 
           it 'plays the correct ssml' do
             expect_ssml_output ssml
-            subject.say_characters('1234#abc').should be true
+            expect(subject.say_characters('1234#abc')).to be true
           end
         end
 
@@ -1019,7 +1067,7 @@ module Adhearsion
 
           it 'plays the correct ssml' do
             expect_ssml_output ssml
-            subject.say_characters(1234).should be true
+            expect(subject.say_characters(1234)).to be true
           end
         end
       end
@@ -1034,7 +1082,7 @@ module Adhearsion
 
           it 'plays the correct ssml' do
             expect_async_ssml_output ssml
-            subject.say_characters!('1234#abc').should be_a Punchblock::Component::Output
+            expect(subject.say_characters!('1234#abc')).to be_a Punchblock::Component::Output
           end
         end
 
@@ -1047,7 +1095,7 @@ module Adhearsion
 
           it 'plays the correct ssml' do
             expect_async_ssml_output ssml
-            subject.say_characters!(1234).should be_a Punchblock::Component::Output
+            expect(subject.say_characters!(1234)).to be_a Punchblock::Component::Output
           end
         end
       end