spec/validity_spec.rb in r509-0.10.0 vs spec/validity_spec.rb in r509-1.0

@@ -4,95 +4,95 @@
 
 describe R509::Validity do
   context "status" do
     it "has no status" do
       status = R509::Validity::Status.new
-      status.status.should == nil
-      status.ocsp_status.should == OpenSSL::OCSP::V_CERTSTATUS_UNKNOWN
+      expect(status.status).to be_nil
+      expect(status.ocsp_status).to eq(OpenSSL::OCSP::V_CERTSTATUS_UNKNOWN)
     end
     it "has a valid status" do
       status = R509::Validity::Status.new(:status => R509::Validity::VALID)
-      status.status.should == R509::Validity::VALID
-      status.ocsp_status.should == OpenSSL::OCSP::V_CERTSTATUS_GOOD
+      expect(status.status).to eq(R509::Validity::VALID)
+      expect(status.ocsp_status).to eq(OpenSSL::OCSP::V_CERTSTATUS_GOOD)
     end
     it "has a revoked status" do
       status = R509::Validity::Status.new(:status => R509::Validity::REVOKED)
-      status.status.should == R509::Validity::REVOKED
-      status.ocsp_status.should == OpenSSL::OCSP::V_CERTSTATUS_REVOKED
-      status.revocation_time.should_not == nil
-      status.revocation_reason.should == 0
+      expect(status.status).to eq(R509::Validity::REVOKED)
+      expect(status.ocsp_status).to eq(OpenSSL::OCSP::V_CERTSTATUS_REVOKED)
+      expect(status.revocation_time).not_to be_nil
+      expect(status.revocation_reason).to eq(0)
     end
     it "has an unknown status" do
       status = R509::Validity::Status.new(:status => R509::Validity::UNKNOWN)
-      status.status.should == R509::Validity::UNKNOWN
-      status.ocsp_status.should == OpenSSL::OCSP::V_CERTSTATUS_UNKNOWN
+      expect(status.status).to eq(R509::Validity::UNKNOWN)
+      expect(status.ocsp_status).to eq(OpenSSL::OCSP::V_CERTSTATUS_UNKNOWN)
     end
     it "has some other status that we don't know about" do
       status = R509::Validity::Status.new(:status => 10101010101)
-      status.status.should == 10101010101
-      status.ocsp_status.should == OpenSSL::OCSP::V_CERTSTATUS_UNKNOWN
+      expect(status.status).to eq(10101010101)
+      expect(status.ocsp_status).to eq(OpenSSL::OCSP::V_CERTSTATUS_UNKNOWN)
     end
     it "has no revocation time or reason specified (and isn't revoked)" do
       status = R509::Validity::Status.new
-      status.revocation_time.should == nil
-      status.revocation_reason.should == 0
+      expect(status.revocation_time).to be_nil
+      expect(status.revocation_reason).to eq(0)
     end
     it "specifies a revocation time" do
       time = Time.now.to_i
       status = R509::Validity::Status.new(:revocation_time => time)
-      status.revocation_time.should == time
+      expect(status.revocation_time).to eq(time)
     end
     it "specifies a revocation reason" do
       status = R509::Validity::Status.new(:revocation_reason => 2)
-      status.revocation_reason.should == 2
+      expect(status.revocation_reason).to eq(2)
     end
   end
   context "writer base" do
     it "calls issue" do
       writer = R509::Validity::Writer.new
-      expect { writer.issue("a",1) }.to raise_error(NotImplementedError, "You must call #issue on a subclass of Writer")
+      expect { writer.issue("a", 1) }.to raise_error(NotImplementedError, "You must call #issue on a subclass of Writer")
     end
     it "calls revoke" do
       writer = R509::Validity::Writer.new
-      expect { writer.revoke("a",1, 1) }.to raise_error(NotImplementedError, "You must call #revoke on a subclass of Writer")
+      expect { writer.revoke("a", 1, 1) }.to raise_error(NotImplementedError, "You must call #revoke on a subclass of Writer")
     end
     it "calls is_available?" do
       writer = R509::Validity::Writer.new
       expect { writer.is_available? }.to raise_error(NotImplementedError, "You must call #is_available? on a subclass of Writer")
     end
   end
   context "checker base" do
     it "calls check" do
       checker = R509::Validity::Checker.new
-      expect { checker.check("a",1) }.to raise_error(NotImplementedError, "You must call #check on a subclass of Checker")
+      expect { checker.check("a", 1) }.to raise_error(NotImplementedError, "You must call #check on a subclass of Checker")
     end
     it "calls is_available?" do
       checker = R509::Validity::Checker.new
       expect { checker.is_available? }.to raise_error(NotImplementedError, "You must call #is_available? on a subclass of Checker")
     end
   end
   context "writer default" do
     it "calls issue" do
       writer = R509::Validity::DefaultWriter.new
-      writer.issue("a",1)
+      writer.issue("a", 1)
     end
     it "calls revoke" do
       writer = R509::Validity::DefaultWriter.new
-      writer.revoke("a",1, 1)
+      writer.revoke("a", 1, 1)
     end
     it "calls is_available?" do
       writer = R509::Validity::DefaultWriter.new
-      writer.is_available?.should == true
+      expect(writer.is_available?).to eq(true)
     end
   end
   context "checker default" do
     it "calls check" do
       checker = R509::Validity::DefaultChecker.new
-      status = checker.check("a",1)
-      status.status.should == R509::Validity::VALID
+      status = checker.check("a", 1)
+      expect(status.status).to eq(R509::Validity::VALID)
     end
     it "calls is_available?" do
       checker = R509::Validity::DefaultChecker.new
-      checker.is_available?.should == true
+      expect(checker.is_available?).to eq(true)
     end
   end
 end