localeapp 0.9.3 → 1.0.0

data/spec/localeapp/default_value_handler_spec.rb

@@ -20,21 +20,21 @@ describe I18n::Backend::Base, '#default' do
   describe "when subject is a String" do
     it "adds translations to missing translations to send to Locale" do
       allow_sending do
-        Localeapp.missing_translations.should_receive(:add).with(:en, 'foo', 'bar', :baz => 'bam')
+        expect(Localeapp.missing_translations).to receive(:add).with(:en, 'foo', 'bar', :baz => 'bam')
         klass.default(:en, 'foo', 'bar', :baz => 'bam')
       end
     end
 
     it "strips the subject when the translation is not in the default locale" do
       allow_sending do
-        Localeapp.missing_translations.should_receive(:add).with(:fr, 'foo', nil, :baz => 'bam')
+        expect(Localeapp.missing_translations).to receive(:add).with(:fr, 'foo', nil, :baz => 'bam')
         klass.default(:fr, 'foo', 'bar', :baz => 'bam')
       end
     end
 
     it "adds translations to missing translations when using a string as the locale" do
       allow_sending do
-        Localeapp.missing_translations.should_receive(:add).with('en', 'foo', 'bar', :baz => 'bam')
+        expect(Localeapp.missing_translations).to receive(:add).with('en', 'foo', 'bar', :baz => 'bam')
         klass.default('en', 'foo', 'bar', :baz => 'bam')
       end
     end
@@ -45,7 +45,7 @@ describe I18n::Backend::Base, '#default' do
     describe "and there is a text inside the array" do
       it "add translations to missing translations to send to Locale" do
         allow_sending do
-          Localeapp.missing_translations.should_receive(:add).with(:en, 'foo', 'correct default', :baz => 'bam')
+          expect(Localeapp.missing_translations).to receive(:add).with(:en, 'foo', 'correct default', :baz => 'bam')
           klass.default(:en, 'foo', [:missing, 'correct default'], :baz => 'bam')
         end
       end
@@ -54,8 +54,8 @@ describe I18n::Backend::Base, '#default' do
     describe "and there is not a text inside the array" do
       it "doesn't send anything to Locale" do
         allow_sending do
-          Localeapp.missing_translations.should_not_receive(:add)
-          I18n.stub(:translate) do |subject, _|
+          expect(Localeapp.missing_translations).not_to receive(:add)
+          allow(I18n).to receive(:translate) do |subject, _|
             subject == :not_missing ? "not missing" : nil
           end
           klass.default(:en, 'foo', [:missing, :not_missing], :baz => 'bam')
@@ -67,7 +67,7 @@ describe I18n::Backend::Base, '#default' do
   describe "when subject is a Symbol" do
     it "doesn't send anything to Locale" do
       allow_sending do
-        Localeapp.missing_translations.should_not_receive(:add)
+        expect(Localeapp.missing_translations).not_to receive(:add)
         klass.default(:en, 'foo', :other_key, :baz => 'bam')
       end
     end
@@ -77,7 +77,7 @@ describe I18n::Backend::Base, '#default' do
     i18n = I18nWithFallbacks.new
 
     with_configuration(:sending_environments => ['my_env'], :environment_name => 'my_env' ) do
-      Localeapp.missing_translations.should_receive(:add).with(:en, 'my.object', 'my default', {:default => 'my default'})
+      expect(Localeapp.missing_translations).to receive(:add).with(:en, 'my.object', 'my default', {:default => 'my default'})
       i18n.translate(:en, 'my.object', :default => 'my default')
     end
   end

data/spec/localeapp/exception_handler_spec.rb

@@ -9,24 +9,24 @@ describe Localeapp::ExceptionHandler, '#call(exception, locale, key, options)' d
   end
 
   it "adds the missing translation to the missing translation list" do
-    Localeapp.missing_translations.should_receive(:add).with(:en, 'foo', nil, { :baz => 'bam' })
+    expect(Localeapp.missing_translations).to receive(:add).with(:en, 'foo', nil, { :baz => 'bam' })
     I18n.t('foo', :baz => 'bam')
   end
 
   it "handles when the key is an array of keys" do
-    Localeapp.missing_translations.should_receive(:add).with(:en, 'foo', nil, {})
-    Localeapp.missing_translations.should_receive(:add).with(:en, 'bar', nil, {})
+    expect(Localeapp.missing_translations).to receive(:add).with(:en, 'foo', nil, {})
+    expect(Localeapp.missing_translations).to receive(:add).with(:en, 'bar', nil, {})
     I18n.t(['foo', 'bar'])
   end
 
   it "handles when the default is a Symbol that can be resolved" do
     I18n.backend.store_translations(:en, {:default_symbol_test => 'is resolved'})
-    Localeapp.missing_translations.should_not_receive(:add)
-    I18n.t(:foo, :default => :default_symbol_test).should == 'is resolved'
+    expect(Localeapp.missing_translations).not_to receive(:add)
+    expect(I18n.t(:foo, :default => :default_symbol_test)).to eq('is resolved')
   end
 
   it "handles when the default is a Symbol that can't be resolved" do
-    Localeapp.missing_translations.should_receive(:add).with(:en, :foo, nil, {:default => :bar})
+    expect(Localeapp.missing_translations).to receive(:add).with(:en, :foo, nil, {:default => :bar})
     I18n.t(:foo, :default => :bar)
   end
 

data/spec/localeapp/key_checker_spec.rb

@@ -6,7 +6,7 @@ describe Localeapp::KeyChecker, "#check(key)" do
     with_configuration do
       @checker = Localeapp::KeyChecker.new
     end
-    @checker.check('TEST_KEY').should == [false, {}]
+    expect(@checker.check('TEST_KEY')).to eq([false, {}])
   end
 
   it "returns true and and the parsed json hash if the response from locale app is a 200" do
@@ -14,6 +14,6 @@ describe Localeapp::KeyChecker, "#check(key)" do
     with_configuration do
       @checker = Localeapp::KeyChecker.new
     end
-    @checker.check('TEST_KEY').should == [true, valid_project_data]
+    expect(@checker.check('TEST_KEY')).to eq([true, valid_project_data])
   end
 end

data/spec/localeapp/missing_translations_spec.rb

@@ -5,17 +5,17 @@ describe Localeapp::MissingTranslations, "#add(locale, key, description = nil, o
   it "stores the missing translation data" do
     translations = Localeapp::MissingTranslations.new
     translations.add(:en, 'foo', 'bar', { :baz => 'bam' })
-    translations[:en].should include('foo')
-    translations[:en]['foo'].description.should == 'bar'
-    translations[:en]['foo'].options.should == { :baz => 'bam' }
+    expect(translations[:en]).to include('foo')
+    expect(translations[:en]['foo'].description).to eq('bar')
+    expect(translations[:en]['foo'].options).to eq({ :baz => 'bam' })
   end
 
   it "respects I18n options when constructing a key" do
     translations = Localeapp::MissingTranslations.new
     translations.add(:en, 'foo', nil, { :scope => 'bar', :baz => 'bam' })
 
-    translations[:en].should include('bar.foo')
-    translations[:en]['bar.foo'].options.should == { :baz => 'bam' }
+    expect(translations[:en]).to include('bar.foo')
+    expect(translations[:en]['bar.foo'].options).to eq({ :baz => 'bam' })
   end
 end
 
@@ -26,26 +26,26 @@ describe Localeapp::MissingTranslations, "#to_send" do
     translations.add(:es, 'bar', 'baz')
 
     to_send = translations.to_send
-    to_send.size.should == 2
-    to_send[0][:key].should == 'foo'
-    to_send[0][:locale].should == :en
-    to_send[0].should_not have_key(:description)
-    to_send[0][:options].should == { :baz => 'bam' }
-    to_send[1][:key].should == 'bar'
-    to_send[1][:locale].should == :es
-    to_send[1][:description].should == 'baz'
-    to_send[1][:options].should == {}
+    expect(to_send.size).to eq(2)
+    expect(to_send[0][:key]).to eq('foo')
+    expect(to_send[0][:locale]).to eq(:en)
+    expect(to_send[0]).not_to have_key(:description)
+    expect(to_send[0][:options]).to eq({ :baz => 'bam' })
+    expect(to_send[1][:key]).to eq('bar')
+    expect(to_send[1][:locale]).to eq(:es)
+    expect(to_send[1][:description]).to eq('baz')
+    expect(to_send[1][:options]).to eq({})
   end
 
   it "doesn't send the same key twice when cache_missing_translations is true" do
     with_configuration(:cache_missing_translations => true) do
       translation_a = Localeapp::MissingTranslations.new
       translation_a.add(:es, 'foobybar')
-      translation_a.to_send.size.should == 1
+      expect(translation_a.to_send.size).to eq(1)
 
       translation_b = Localeapp::MissingTranslations.new
       translation_b.add(:en, 'foobybar')
-      translation_a.to_send.size.should == 0
+      expect(translation_a.to_send.size).to eq(0)
     end
   end
 
@@ -53,11 +53,11 @@ describe Localeapp::MissingTranslations, "#to_send" do
     with_configuration(:cache_missing_translations => false) do
       translation_a = Localeapp::MissingTranslations.new
       translation_a.add(:es, 'foobybar')
-      translation_a.to_send.size.should == 1
+      expect(translation_a.to_send.size).to eq(1)
 
       translation_b = Localeapp::MissingTranslations.new
       translation_b.add(:en, 'foobybar')
-      translation_a.to_send.size.should == 1
+      expect(translation_a.to_send.size).to eq(1)
     end
   end
 end

data/spec/localeapp/poller_spec.rb

@@ -16,11 +16,11 @@ describe Localeapp::Poller do
   describe "#needs_reloading?" do
     it "returns true when updated_at has been changed in the synchronization file" do
       @poller.write_synchronization_data!(@poller.polled_at, 12345)
-      @poller.needs_reloading?.should be_true
+      expect(@poller.needs_reloading?).to be true
     end
 
     it "returns false when updated_at is the same as in the synchronization file" do
-      @poller.needs_reloading?.should be_false
+      expect(@poller.needs_reloading?).to be false
     end
   end
 
@@ -49,17 +49,17 @@ describe Localeapp::Poller do
       end
 
       it "returns false" do
-        @poller.poll!.should == false
+        expect(@poller.poll!).to eq(false)
       end
 
       it "updates the polled_at but not the updated_at synchronization data" do
-        @poller.stub(:current_time).and_return(polled_at_time)
-        @poller.should_receive(:write_synchronization_data!).with(polled_at_time, @updated_at)
+        allow(@poller).to receive(:current_time).and_return(polled_at_time)
+        expect(@poller).to receive(:write_synchronization_data!).with(polled_at_time, @updated_at)
         @poller.poll!
       end
 
       it "updates the synchronization data" do
-        @poller.should_receive(:write_synchronization_data!)
+        expect(@poller).to receive(:write_synchronization_data!)
         @poller.poll!
       end
     end
@@ -70,11 +70,11 @@ describe Localeapp::Poller do
       end
 
       it "returns false" do
-        @poller.poll!.should == false
+        expect(@poller.poll!).to eq(false)
       end
 
       it "doesn't update the synchronization data" do
-        @poller.should_not_receive(:write_synchronization_data!)
+        expect(@poller).not_to receive(:write_synchronization_data!)
         @poller.poll!
       end
     end
@@ -90,18 +90,18 @@ describe Localeapp::Poller do
       end
 
       it "returns true" do
-        @poller.poll!.should == true
+        expect(@poller.poll!).to eq(true)
       end
 
       it "updates the polled_at and the updated_at synchronization data" do
-        @poller.stub(:current_time).and_return(polled_at_time)
-        @poller.should_receive(:write_synchronization_data!).with(polled_at_time, updated_at_time)
+        allow(@poller).to receive(:current_time).and_return(polled_at_time)
+        expect(@poller).to receive(:write_synchronization_data!).with(polled_at_time, updated_at_time)
         @poller.poll!
       end
 
       it "passes the data through to the Updater" do
         FakeWeb.register_uri(:get, "https://api.localeapp.com/v1/projects/TEST_KEY/translations.yml?updated_at=#{@updated_at}", :body => @hash.to_yaml, :status => ['200', 'OK'], :date => Time.now.httpdate)
-        Localeapp.updater.should_receive(:update).with(@hash)
+        expect(Localeapp.updater).to receive(:update).with(@hash)
         @poller.poll!
       end
     end

data/spec/localeapp/rails/controller_spec.rb

@@ -19,7 +19,7 @@ describe Localeapp::Rails::Controller, '#handle_translation_updates' do
     with_configuration(configuration) do
       @controller = TestController.new
     end
-    now = Time.now; Time.stub(:now).and_return(now)
+    now = Time.now; allow(Time).to receive(:now).and_return(now)
   end
 
   after do
@@ -33,12 +33,12 @@ describe Localeapp::Rails::Controller, '#handle_translation_updates' do
 
     it "calls poller.poll! when the synchronization file's polled_at has changed" do
       Localeapp.poller.write_synchronization_data!(01234, 56789)
-      Localeapp.poller.should_receive(:poll!)
+      expect(Localeapp.poller).to receive(:poll!)
       @controller.handle_translation_updates
     end
 
     it "doesn't call poller.poll! when the synchronization file's polled_at is the same" do
-      Localeapp.poller.should_not_receive(:poll!)
+      expect(Localeapp.poller).not_to receive(:poll!)
       @controller.handle_translation_updates
     end
   end
@@ -50,12 +50,12 @@ describe Localeapp::Rails::Controller, '#handle_translation_updates' do
 
     it "doesn't poller.poll! when the synchronization file's polled_at has changed" do
       Localeapp.poller.write_synchronization_data!(01234, 56789)
-      Localeapp.poller.should_not_receive(:poll!)
+      expect(Localeapp.poller).not_to receive(:poll!)
       @controller.handle_translation_updates
     end
 
     it "doesn't poller.poll! when the synchronization file's polled_at is the same" do
-      Localeapp.poller.should_not_receive(:poll!)
+      expect(Localeapp.poller).not_to receive(:poll!)
       @controller.handle_translation_updates
     end
   end
@@ -63,17 +63,17 @@ describe Localeapp::Rails::Controller, '#handle_translation_updates' do
   context "when reloading is enabled" do
     before do
       Localeapp.configuration.environment_name = 'development'
-      Localeapp.poller.stub(:poll!)
+      allow(Localeapp.poller).to receive(:poll!)
     end
 
     it "calls I18n.reload! when the synchronization file's updated_at has changed" do
       Localeapp.poller.write_synchronization_data!(01234, 56789)
-      I18n.should_receive(:reload!)
+      expect(I18n).to receive(:reload!)
       @controller.handle_translation_updates
     end
 
     it "doesn't call I18n.relaod! when the synchronization file's updated_at is the same" do
-      I18n.should_not_receive(:reload!)
+      expect(I18n).not_to receive(:reload!)
       @controller.handle_translation_updates
     end
   end
@@ -85,12 +85,12 @@ describe Localeapp::Rails::Controller, '#handle_translation_updates' do
 
     it "doesn't call I18n.reload! when the synchronization file's updated_at has changed" do
       Localeapp.poller.write_synchronization_data!(01234, 56789)
-      I18n.should_not_receive(:reload!)
+      expect(I18n).not_to receive(:reload!)
       @controller.handle_translation_updates
     end
 
     it "doesn't call I18n.relaod! when the synchronization file's updated_at is the same" do
-      I18n.should_not_receive(:reload!)
+      expect(I18n).not_to receive(:reload!)
       @controller.handle_translation_updates
     end
   end
@@ -127,19 +127,19 @@ describe Localeapp::Rails::Controller, '#send_missing_translations' do
 
   it "does nothing when sending is disabled" do
     Localeapp.configuration.environment_name = 'test'
-    Localeapp.sender.should_not_receive(:post_missing_translations)
+    expect(Localeapp.sender).not_to receive(:post_missing_translations)
     @controller.send_missing_translations
   end
 
   it "proceeds when configuration is enabled" do
     Localeapp.configuration.environment_name = 'development'
-    Localeapp.sender.should_receive(:post_missing_translations)
+    expect(Localeapp.sender).to receive(:post_missing_translations)
     @controller.send_missing_translations
   end
 
   it "rejects blacklisted translations" do
     Localeapp.configuration.environment_name = 'development'
-    Localeapp.missing_translations.should_receive(:reject_blacklisted)
+    expect(Localeapp.missing_translations).to receive(:reject_blacklisted)
     @controller.send_missing_translations
   end
 end

data/spec/localeapp/routes_spec.rb

@@ -14,8 +14,8 @@ describe Localeapp::Routes do
     it "returns :get and the project url for the options" do
       with_configuration(@config) do
         options = { :foo => :bar }
-        @routes.should_receive(:project_url).with(options).and_return('url')
-        @routes.project_endpoint(options).should == [:get, 'url']
+        expect(@routes).to receive(:project_url).with(options).and_return('url')
+        expect(@routes.project_endpoint(options)).to eq([:get, 'url'])
       end
     end
   end
@@ -23,19 +23,19 @@ describe Localeapp::Routes do
   describe '#project_url' do
     it "is constructed from the configuration host, port and secure and defaults to json" do
       with_configuration(@config.merge(:port => 1234, :secure => false)) do
-        @routes.project_url.should == "http://test.host:1234/v1/projects/API_KEY.json"
+        expect(@routes.project_url).to eq("http://test.host:1234/v1/projects/API_KEY.json")
       end
     end
 
     it "includes http auth if in configuration" do
       with_configuration(@config.merge(:port => 1234, :http_auth_username => 'foo', :http_auth_password => 'bar')) do
-        @routes.project_url.should == "https://foo:bar@test.host:1234/v1/projects/API_KEY.json"
+        expect(@routes.project_url).to eq("https://foo:bar@test.host:1234/v1/projects/API_KEY.json")
       end
     end
 
     it "can be changed to another content type" do
       with_configuration(@config) do
-        @routes.project_url(:format => :yml).should == 'https://test.host/v1/projects/API_KEY.yml'
+        expect(@routes.project_url(:format => :yml)).to eq('https://test.host/v1/projects/API_KEY.yml')
       end
     end
   end
@@ -43,21 +43,21 @@ describe Localeapp::Routes do
   describe "#translations_url" do
     it "it extends the project_url and defaults to yml" do
       with_configuration(@config) do
-        @routes.translations_url.should == "https://test.host/v1/projects/API_KEY/translations.yml"
+        expect(@routes.translations_url).to eq("https://test.host/v1/projects/API_KEY/translations.yml")
       end
     end
 
     it "adds query parameters on to the url" do
       with_configuration(@config) do
         url = @routes.translations_url(:query => {:updated_at => '2011-04-19', :foo => :bar})
-        url.should match(/\?.*updated_at=2011-04-19/)
-        url.should match(/\?.*foo=bar/)
+        expect(url).to match(/\?.*updated_at=2011-04-19/)
+        expect(url).to match(/\?.*foo=bar/)
       end
     end
 
     it "can be changed to another content type" do
       with_configuration(@config) do
-        @routes.translations_url(:format => :json).should == 'https://test.host/v1/projects/API_KEY/translations.json'
+        expect(@routes.translations_url(:format => :json)).to eq('https://test.host/v1/projects/API_KEY/translations.json')
       end
     end
   end
@@ -66,8 +66,8 @@ describe Localeapp::Routes do
     it "returns :get and the translations url for the options" do
       with_configuration(@config) do
         options = { :foo => :bar }
-        @routes.should_receive(:translations_url).with(options).and_return('url')
-        @routes.translations_endpoint(options).should == [:get, 'url']
+        expect(@routes).to receive(:translations_url).with(options).and_return('url')
+        expect(@routes.translations_endpoint(options)).to eq([:get, 'url'])
       end
     end
   end
@@ -76,8 +76,8 @@ describe Localeapp::Routes do
     it "returns :post and the translation url for the options" do
       with_configuration(@config) do
         options = { :foo => :bar }
-        @routes.should_receive(:translations_url).with(options).and_return('url')
-        @routes.create_translation_endpoint(options).should == [:post, 'url']
+        expect(@routes).to receive(:translations_url).with(options).and_return('url')
+        expect(@routes.create_translation_endpoint(options)).to eq([:post, 'url'])
       end
     end
   end
@@ -86,8 +86,8 @@ describe Localeapp::Routes do
     it "returns :delete and the remove url for the options" do
       with_configuration(@config) do
         options = { :key => 'foo.bar' }
-        @routes.should_receive(:remove_url).with(options).and_return('url')
-        @routes.remove_endpoint(options).should == [:delete, 'url']
+        expect(@routes).to receive(:remove_url).with(options).and_return('url')
+        expect(@routes.remove_endpoint(options)).to eq([:delete, 'url'])
       end
     end
   end
@@ -95,7 +95,7 @@ describe Localeapp::Routes do
   describe "#remove_url(options = {})" do
     it "it extends the project_url and includes the escaped key name" do
       with_configuration(@config) do
-        @routes.remove_url(:key => 'test.key').should == "https://test.host/v1/projects/API_KEY/translations/test%2Ekey"
+        expect(@routes.remove_url(:key => 'test.key')).to eq("https://test.host/v1/projects/API_KEY/translations/test%2Ekey")
       end
     end
   end
@@ -104,8 +104,8 @@ describe Localeapp::Routes do
     it "returns :post and the rename url for the options" do
       with_configuration(@config) do
         options = { :current_name => 'foo.bar' }
-        @routes.should_receive(:rename_url).with(options).and_return('url')
-        @routes.rename_endpoint(options).should == [:post, 'url']
+        expect(@routes).to receive(:rename_url).with(options).and_return('url')
+        expect(@routes.rename_endpoint(options)).to eq([:post, 'url'])
       end
     end
   end
@@ -113,7 +113,7 @@ describe Localeapp::Routes do
   describe "#rename_url(options = {})" do
     it "it extends the project_url and includes the escaped key name" do
       with_configuration(@config) do
-        @routes.rename_url(:current_name => 'test.key').should == "https://test.host/v1/projects/API_KEY/translations/test%2Ekey/rename"
+        expect(@routes.rename_url(:current_name => 'test.key')).to eq("https://test.host/v1/projects/API_KEY/translations/test%2Ekey/rename")
       end
     end
   end
@@ -121,21 +121,21 @@ describe Localeapp::Routes do
   describe "#export_url" do
     it "it extends the project_url and defaults to yml" do
       with_configuration(@config) do
-        @routes.export_url.should == "https://test.host/v1/projects/API_KEY/translations/all.yml"
+        expect(@routes.export_url).to eq("https://test.host/v1/projects/API_KEY/translations/all.yml")
       end
     end
 
     it "adds query parameters on to the url" do
       with_configuration(@config) do
         url = @routes.export_url(:query => {:updated_at => '2011-04-19', :foo => :bar})
-        url.should match(/\?.*updated_at=2011-04-19/)
-        url.should match(/\?.*foo=bar/)
+        expect(url).to match(/\?.*updated_at=2011-04-19/)
+        expect(url).to match(/\?.*foo=bar/)
       end
     end
 
     it "can be changed to another content type" do
       with_configuration(@config) do
-        @routes.export_url(:format => :json).should == 'https://test.host/v1/projects/API_KEY/translations/all.json'
+        expect(@routes.export_url(:format => :json)).to eq('https://test.host/v1/projects/API_KEY/translations/all.json')
       end
     end
   end
@@ -144,8 +144,8 @@ describe Localeapp::Routes do
     it "returns :get and the export url for the options" do
       with_configuration(@config) do
         options = { :foo => :bar }
-        @routes.should_receive(:export_url).with(options).and_return('url')
-        @routes.export_endpoint(options).should == [:get, 'url']
+        expect(@routes).to receive(:export_url).with(options).and_return('url')
+        expect(@routes.export_endpoint(options)).to eq([:get, 'url'])
       end
     end
   end
@@ -154,8 +154,8 @@ describe Localeapp::Routes do
     it "returns :post and the missing_translations url for the options" do
       with_configuration(@config) do
         options = { :foo => :bar }
-        @routes.should_receive(:missing_translations_url).with(options).and_return('url')
-        @routes.missing_translations_endpoint(options).should == [:post, 'url']
+        expect(@routes).to receive(:missing_translations_url).with(options).and_return('url')
+        expect(@routes.missing_translations_endpoint(options)).to eq([:post, 'url'])
       end
     end
   end
@@ -163,21 +163,21 @@ describe Localeapp::Routes do
   describe "#missing_translations_url" do
     it "it extends the project_url and defaults to json" do
       with_configuration(@config) do
-        @routes.missing_translations_url.should == "https://test.host/v1/projects/API_KEY/translations/missing.json"
+        expect(@routes.missing_translations_url).to eq("https://test.host/v1/projects/API_KEY/translations/missing.json")
       end
     end
 
     it "adds query parameters on to the url" do
       with_configuration(@config) do
         url = @routes.missing_translations_url(:query => {:updated_at => '2011-04-19', :foo => :bar})
-        url.should match(/\?.*updated_at=2011-04-19/)
-        url.should match(/\?.*foo=bar/)
+        expect(url).to match(/\?.*updated_at=2011-04-19/)
+        expect(url).to match(/\?.*foo=bar/)
       end
     end
 
     it "can be changed to another content type" do
       with_configuration(@config) do
-        @routes.missing_translations_url(:format => :yml).should == 'https://test.host/v1/projects/API_KEY/translations/missing.yml'
+        expect(@routes.missing_translations_url(:format => :yml)).to eq('https://test.host/v1/projects/API_KEY/translations/missing.yml')
       end
     end
   end
@@ -185,7 +185,7 @@ describe Localeapp::Routes do
   describe "#import_url" do
     it "appends 'import to the project url" do
       with_configuration(@config) do
-        @routes.import_url.should == 'https://test.host/v1/projects/API_KEY/import/'
+        expect(@routes.import_url).to eq('https://test.host/v1/projects/API_KEY/import/')
       end
     end
   end
@@ -194,8 +194,8 @@ describe Localeapp::Routes do
     it "returns :post and the import url for the options" do
       with_configuration(@config) do
         options = { :foo => :bar }
-        @routes.should_receive(:import_url).with(options).and_return('url')
-        @routes.import_endpoint(options).should == [:post, 'url']
+        expect(@routes).to receive(:import_url).with(options).and_return('url')
+        expect(@routes.import_endpoint(options)).to eq([:post, 'url'])
       end
     end
   end