Tests: Upgrade to modern RSpec syntax

Replace should and stub with expect etc.

Author: docstun

spec/in_context_editor_spec.rb

@@ -9,14 +9,14 @@
       end
     end
 
-    specify { PhraseApp::InContextEditor.prefix.should eql("my prefix") }
-    specify { PhraseApp::InContextEditor.suffix.should eql("my suffix") }
+    specify { expect(PhraseApp::InContextEditor.prefix).to eql("my prefix") }
+    specify { expect(PhraseApp::InContextEditor.suffix).to eql("my suffix") }
   end
 
   describe "#self.with_config(config_options={}, &block)" do
     it "should allow to set a config that is only present in a given block" do
       PhraseApp::InContextEditor.config.project_id = "old-project-id"
-      PhraseApp::InContextEditor.project_id.should eql "old-project-id"
+      expect(PhraseApp::InContextEditor.project_id).to eql "old-project-id"
       project_id_1 = nil
       project_id_2 = nil
       PhraseApp::InContextEditor.with_config(project_id: "my-new-project-id") do
@@ -27,10 +27,9 @@
         project_id_1 = PhraseApp::InContextEditor.project_id
       end
 
-      project_id_1.should eql "my-new-project-id"
-      project_id_2.should eql "my-newest-project-id"
-
-      PhraseApp::InContextEditor.project_id.should eql "old-project-id"
+      expect(project_id_1).to eql "my-new-project-id"
+      expect(project_id_2).to eql "my-newest-project-id"
+      expect(PhraseApp::InContextEditor.project_id).to eql "old-project-id"
     end
   end
 end

spec/phraseapp-in-context-editor-ruby/backend_service_spec.rb

@@ -19,9 +19,9 @@
     before(:each) do
       PhraseApp::InContextEditor.config.prefix = "{{__"
       PhraseApp::InContextEditor.config.suffix = "__}}"
-      I18n.stub(:translate_without_phraseapp).with(key_name).and_return(i18n_translation)
-      phraseapp_service.stub(:has_blacklist_entry_for_key?){ key_is_blacklisted }
-      phraseapp_service.stub(:key_is_ignored?) { key_is_ignored }
+      allow(I18n).to receive(:translate_without_phraseapp).with(key_name).and_return(i18n_translation)
+      allow(phraseapp_service).to receive(:has_blacklist_entry_for_key?){ key_is_blacklisted }
+      allow(phraseapp_service).to receive(:key_is_ignored?) { key_is_ignored }
     end
 
     subject { phraseapp_service.translate(*args) }
@@ -35,58 +35,58 @@
         let(:args){ [key_name] }
         let(:key_is_blacklisted){ true }
 
-        it { should eql i18n_translation }
+        it { is_expected.to eql i18n_translation }
       end
 
       context "key is ignored" do
         let(:args) { [key_name] }
         let(:key_is_ignored) { true }
 
-        it { should eql i18n_translation }
+        it { is_expected.to eql i18n_translation }
       end
 
       context "resolve: false given as argument" do
         let(:args){ [key_name, resolve: false] }
 
         before(:each) do
-          I18n.stub(:translate_without_phraseapp).with(key_name, resolve: false).and_return(i18n_translation)
+          allow(I18n).to receive(:translate_without_phraseapp).with(key_name, resolve: false).and_return(i18n_translation)
         end
 
-        it { should eql i18n_translation }
+        it { is_expected.to eql i18n_translation }
       end
 
       context "resolve: true given as argument" do
         let(:args){ [key_name, resolve: true] }
 
-        it { should be_a String }
-        it { should eql '{{__phrase_foo.bar__}}' }
+        it { is_expected.to be_a String }
+        it { is_expected.to eql '{{__phrase_foo.bar__}}' }
       end
 
       context "key is not blacklisted" do
         let(:args){ [key_name] }
         let(:key_is_blacklisted){ false }
 
-        it { should be_a PhraseApp::InContextEditor::Delegate::I18nDelegate }
-        it { should eql '{{__phrase_foo.bar__}}' }
+        it { is_expected.to be_a PhraseApp::InContextEditor::Delegate::I18nDelegate }
+        it { is_expected.to eql '{{__phrase_foo.bar__}}' }
       end
 
       describe "different arguments given" do
         context "default array given", vcr: {cassette_name: 'fetch list of keys filtered by fallback key names'} do
           let(:args){ [:key, { :default => [:first_fallback, :second_fallback] }] }
-          it { should eql '{{__phrase_key__}}' }
+          it { is_expected.to eql '{{__phrase_key__}}' }
         end
 
         context "default string given" do
           let(:args){ [:key, { :default => 'first fallback' }] }
 
-          it { should eql '{{__phrase_key__}}' }
+          it { is_expected.to eql '{{__phrase_key__}}' }
         end
 
         context "scope array given" do
-          let(:context_key_translation){ stub }
+          let(:context_key_translation){ double }
           let(:args){ [:key, { :scope => [:context] }] }
 
-          it { should eql '{{__phrase_context.key__}}' }
+          it { is_expected.to eql '{{__phrase_context.key__}}' }
         end
       end
     end
@@ -98,41 +98,41 @@
         PhraseApp::InContextEditor.enabled = false
       end
 
-      it { should eql i18n_translation }
+      it { is_expected.to eql i18n_translation }
 
       context "given arguments other than key_name" do
         let(:args){ [key_name, locale: :ru] }
         let(:ru_translation){ double }
 
         before(:each) do
-          I18n.stub(:translate_without_phraseapp).with(key_name, locale: :ru){ ru_translation }
+          allow(I18n).to receive(:translate_without_phraseapp).with(key_name, locale: :ru){ ru_translation }
         end
 
-        it { should eql ru_translation }
+        it { is_expected.to eql ru_translation }
       end
 
       describe "different arguments given" do
         before(:each) do
-          I18n.unstub(:translate_without_phraseapp)
+          allow(I18n).to receive(:translate_without_phraseapp).and_call_original
         end
 
         context "default array given" do
           let(:args) { [:key, { :default => [:first_fallback, :second_fallback] }] }
 
-          specify { subject.should eql "translation missing: en.key" }
+          it { is_expected.to eql "translation missing: en.key" }
         end
 
         context "default string given" do
           let(:args) { [:key, { :default => 'first fallback' }] }
 
-          it { should eql 'first fallback' }
+          it { is_expected.to eql 'first fallback' }
         end
 
         context "scope array given" do
-          let(:context_key_translation) { stub }
+          let(:context_key_translation) { double }
           let(:args) { [:key, { :scope => [:context] }] }
 
-          specify { subject.should eql "translation missing: en.context.key" }
+          it { is_expected.to eql "translation missing: en.context.key" }
         end
       end
     end
@@ -143,22 +143,22 @@
     subject { phraseapp_service.send(:has_blacklist_entry_for_key?, key) }
 
     before(:each) do
-      phraseapp_service.stub(:blacklisted_keys){ blacklisted_keys }
+      allow(phraseapp_service).to receive(:blacklisted_keys){ blacklisted_keys }
     end
 
     context "blacklisted_keys contain key" do
       let(:blacklisted_keys){ [key] }
-      it { should be_truthy }
+      it { is_expected.to be_truthy }
     end
 
     context "key is blacklisted (using wildcards)" do
       let(:blacklisted_keys){ ["foo.black*"] }
-      it { should be_truthy }
+      it { is_expected.to be_truthy }
     end
 
     context "if no blacklisted_keys" do
       let(:blacklisted_keys){ [] }
-      it { should be_falsey }
+      it { is_expected.to be_falsey }
     end
   end
 
@@ -174,31 +174,31 @@
     context "blacklisted_keys contain key" do
       let(:ignored_keys) { ["foo.ignored"] }
 
-      it { should be_truthy }
+      it { is_expected.to be_truthy }
     end
 
     context "key is ignores (using wildcards)" do
       let(:ignored_keys) { ["foo.*"] }
 
-      it { should be_truthy }
+      it { is_expected.to be_truthy }
     end
 
     context "if no keys are ignored" do
       let(:ignored_keys) { [] }
 
-      it { should be_falsey }
+      it { is_expected.to be_falsey }
     end
   end
 
   describe "#blacklisted_keys", vcr: {cassette_name: 'fetch list of blacklisted keys'} do
     subject { phraseapp_service.send(:blacklisted_keys) }
 
-    it { should eql ["faker*"] }
+    it { is_expected.to eql ["faker*"] }
 
     describe "memoizing the blacklisted_keys" do
       specify do
         old_id = phraseapp_service.send(:blacklisted_keys).object_id
-        old_id.should eql subject.object_id
+        expect(old_id).to eql subject.object_id
       end
     end
   end
@@ -208,12 +208,12 @@
 
     context 'default case' do
       let(:args) { ['my.key', {}] }
-      it { should == 'my.key'}
+      it { is_expected.to eql 'my.key'}
     end
 
     context 'the leading dot should be removed' do
       let(:args) { ['.my.key', {}] }
-      it { should == 'my.key'}
+      it { is_expected.to eql 'my.key'}
     end
   end
 end

spec/phraseapp-in-context-editor-ruby/cache_spec.rb

@@ -8,15 +8,15 @@
   let(:cache_key) { :foo }
 
   before(:each) do
-    PhraseApp::InContextEditor.stub(:cache_lifetime).and_return(300)
+    allow(PhraseApp::InContextEditor).to receive(:cache_lifetime).and_return(300)
   end
 
   subject { cache }
 
   describe "#initialize" do
     subject { PhraseApp::InContextEditor::Cache.new(lifetime: 999) }
 
-    it { subject.lifetime.should == 999 }
+    it { expect(subject.lifetime).to eql 999 }
   end
 
   describe "#cached?(cache_key)" do
@@ -35,7 +35,7 @@
         end
       end
 
-      it { should be_truthy }
+      it { is_expected.to be_truthy }
 
       context "the entry has expired" do
         before(:each) do
@@ -44,12 +44,12 @@
           end
         end
 
-        it { should be_falsey }
+        it { is_expected.to be_falsey }
       end
     end
 
     context "no entry for that key exists" do
-      it { should be_falsey }
+      it { is_expected.to be_falsey }
     end
   end
 
@@ -60,7 +60,7 @@
       cache.set(cache_key, "bar")
     end
 
-    it { should == "bar" }
+    it { is_expected.to eql "bar" }
   end
 
   describe "#set(cache_key, value)" do
@@ -70,6 +70,6 @@
       cache.set(cache_key, "bar")
     end
 
-    it { should == "bar" }
+    it { is_expected.to eql "bar" }
   end
 end

spec/phraseapp-in-context-editor-ruby/config_spec.rb

@@ -10,13 +10,13 @@
 
   it "should return the default option when no specific value assigned" do
     config = PhraseApp::InContextEditor::Config.new
-    config.project_id.should eql nil
-    PhraseApp::InContextEditor::Config.project_id.should eql nil
+    expect(config.project_id).to eql(nil)
+    expect(PhraseApp::InContextEditor::Config.project_id).to eql(nil)
     PhraseApp::InContextEditor::Config.project_id = "foo"
-    PhraseApp::InContextEditor::Config.project_id.should eql "foo"
-    config.project_id.should eql "foo"
+    expect(PhraseApp::InContextEditor::Config.project_id).to eql "foo"
+    expect(config.project_id).to eql "foo"
     config.project_id = "bar"
-    config.project_id.should eql "bar"
+    expect(config.project_id).to eql "bar"
     PhraseApp::InContextEditor::Config.project_id = "foo"
   end
 
@@ -26,33 +26,33 @@
       PhraseApp::InContextEditor::Config.access_token = "my-new-token"
       second_api_client = PhraseApp::InContextEditor::Config.api_client
       # Hacky: Currently no better way to check api client renewal
-      second_api_client.object_id.should_not == first_api_client.object_id
-      second_api_client.instance_eval("@credentials").send(:token).should eql "my-new-token"
+      expect(second_api_client.object_id).not_to eql first_api_client.object_id
+      expect(second_api_client.instance_eval("@credentials").send(:token)).to eql("my-new-token")
     end
   end
 
   describe "#assign_values(config_options)" do
     it "should assign the config values to the instance" do
       config = PhraseApp::InContextEditor::Config.new
-      config.project_id.should eql nil
+      expect(config.project_id).to eql(nil)
       config.assign_values(project_id: "foo")
-      config.project_id.should eql "foo"
-      PhraseApp::InContextEditor::Config.project_id.should eql nil
+      expect(config.project_id).to eql("foo")
+      expect(PhraseApp::InContextEditor::Config.project_id).to eql(nil)
     end
   end
 
   describe "#self.reset_to_defaults!" do
     it "should reset the class level variables to their defaults" do
       PhraseApp::InContextEditor::Config.project_id = "foo"
-      PhraseApp::InContextEditor::Config.project_id.should eql "foo"
+      expect(PhraseApp::InContextEditor::Config.project_id).to eql("foo")
       PhraseApp::InContextEditor::Config.reset_to_defaults!
-      PhraseApp::InContextEditor::Config.project_id.should eql nil
+      expect(PhraseApp::InContextEditor::Config.project_id).to eql(nil)
     end
   end
 
   describe "#self.api_client" do
     it "should be generate an api client by default" do
-      PhraseApp::InContextEditor::Config.api_client.should be_a(PhraseApp::Client)
+      expect(PhraseApp::InContextEditor::Config.api_client).to be_a(PhraseApp::Client)
     end
   end
 end