cosmos 3.2.1 → 3.3.0

data/spec/streams/template_stream_protocol_spec.rb

@@ -17,20 +17,20 @@ module Cosmos
 
   describe TemplateStreamProtocol do
     describe "initialize" do
-      it "should initialize attributes" do
+      it "initializes attributes" do
         tsp = TemplateStreamProtocol.new('0xABCD','0xABCD')
-        tsp.bytes_read.should eql 0
-        tsp.bytes_written.should eql 0
-        tsp.interface.should be_nil
-        tsp.stream.should be_nil
-        tsp.post_read_data_callback.should be_nil
-        tsp.post_read_packet_callback.should be_nil
-        tsp.pre_write_packet_callback.should be_nil
+        expect(tsp.bytes_read).to eql 0
+        expect(tsp.bytes_written).to eql 0
+        expect(tsp.interface).to be_nil
+        expect(tsp.stream).to be_nil
+        expect(tsp.post_read_data_callback).to be_nil
+        expect(tsp.post_read_packet_callback).to be_nil
+        expect(tsp.pre_write_packet_callback).to be_nil
       end
     end
 
     describe "connect" do
-      it "should support an initial read delay" do
+      it "supports an initial read delay" do
         class MyStream1 < Stream
           def connect; end
           def read_nonblock; []; end
@@ -44,7 +44,7 @@ module Cosmos
     end
 
     describe "disconnect" do
-      it "should unblock the read queue" do
+      it "unblocks the read queue" do
         tsp = TemplateStreamProtocol.new('0xABCD','0xABCD')
         class MyStream1 < Stream
           def connect; end
@@ -63,7 +63,7 @@ module Cosmos
     end
 
     describe "read" do
-      it "should read packets from the stream" do
+      it "reads packets from the stream" do
         class MyStream < Stream
           def connect; end
           def connected?; true; end
@@ -86,12 +86,12 @@ module Cosmos
         $buffer1 = "\x00\x01\x02\xAB"
         $buffer2 = "\xCD\x44\x02\x03"
         packet = tsp.read(false)
-        packet.buffer.length.should eql 3
+        expect(packet.buffer.length).to eql 3
       end
     end
 
     describe "write" do
-      it "should work without a response" do
+      it "works without a response" do
         $buffer = ''
         class MyStream1 < Stream
           def connect; end
@@ -109,10 +109,10 @@ module Cosmos
         packet.restore_defaults
         tsp.connect(MyStream1.new)
         tsp.write(packet)
-        $buffer.should eq "SOUR:VOLT 1, (@2)\xAB\xCD"
+        expect($buffer).to eq "SOUR:VOLT 1, (@2)\xAB\xCD"
       end
 
-      it "should process responses" do
+      it "processes responses" do
         $buffer = ''
         $read_cnt = 0
         class MyStream2 < Stream
@@ -145,9 +145,9 @@ module Cosmos
         packet.restore_defaults
         tsp.connect(MyStream2.new)
         tsp.write(packet)
-        $buffer.should eq "SOUR:VOLT 10, (@20)\xAB\xCD"
+        expect($buffer).to eq "SOUR:VOLT 10, (@20)\xAB\xCD"
         pkt = tsp.read()
-        pkt.read("VOLTAGE").should eq 10
+        expect(pkt.read("VOLTAGE")).to eq 10
       end
     end
 

data/spec/streams/terminated_stream_protocol_spec.rb

@@ -17,20 +17,20 @@ module Cosmos
 
   describe TerminatedStreamProtocol do
     describe "initialize" do
-      it "should initialize attributes" do
+      it "initializes attributes" do
         tsp = TerminatedStreamProtocol.new('0xABCD','0xABCD')
-        tsp.bytes_read.should eql 0
-        tsp.bytes_written.should eql 0
-        tsp.interface.should be_nil
-        tsp.stream.should be_nil
-        tsp.post_read_data_callback.should be_nil
-        tsp.post_read_packet_callback.should be_nil
-        tsp.pre_write_packet_callback.should be_nil
+        expect(tsp.bytes_read).to eql 0
+        expect(tsp.bytes_written).to eql 0
+        expect(tsp.interface).to be_nil
+        expect(tsp.stream).to be_nil
+        expect(tsp.post_read_data_callback).to be_nil
+        expect(tsp.post_read_packet_callback).to be_nil
+        expect(tsp.pre_write_packet_callback).to be_nil
       end
     end
 
     describe "read" do
-      it "should read packets from the stream" do
+      it "reads packets from the stream" do
         class MyStream < Stream
           def connect; end
           def connected?; true; end
@@ -53,10 +53,10 @@ module Cosmos
         $buffer1 = "\x00\x01\x02\xAB"
         $buffer2 = "\xCD\x44\x02\x03"
         packet = lsp.read
-        packet.buffer.length.should eql 3
+        expect(packet.buffer.length).to eql 3
       end
 
-      it "should keep the the termination characters" do
+      it "keeps the the termination characters" do
         class MyStream < Stream
           def connect; end
           def connected?; true; end
@@ -79,14 +79,14 @@ module Cosmos
         $buffer1 = "\x00\x01\x02\xAB"
         $buffer2 = "\xCD\x44\x02\x03"
         packet = lsp.read
-        packet.buffer.length.should eql 5
-        packet.buffer[-2].unpack('C')[0].should eql 0xAB
-        packet.buffer[-1].unpack('C')[0].should eql 0xCD
+        expect(packet.buffer.length).to eql 5
+        expect(packet.buffer[-2].unpack('C')[0]).to eql 0xAB
+        expect(packet.buffer[-1].unpack('C')[0]).to eql 0xCD
       end
     end
 
     describe "write" do
-      it "should append termination characters to the packet" do
+      it "appends termination characters to the packet" do
         class MyStream < Stream
           def connect; end
           def connected?; true; end
@@ -100,12 +100,12 @@ module Cosmos
         pkt = Packet.new('tgt','pkt')
         pkt.buffer = "\x00\x01\x02\x03"
         packet = lsp.write(pkt)
-        $buffer.length.should eql 6
-        $buffer[-2].unpack('C')[0].should eql 0xCD
-        $buffer[-1].unpack('C')[0].should eql 0xEF
+        expect($buffer.length).to eql 6
+        expect($buffer[-2].unpack('C')[0]).to eql 0xCD
+        expect($buffer[-1].unpack('C')[0]).to eql 0xEF
       end
 
-      it "should complain if the packet buffer contains the termination characters" do
+      it "complains if the packet buffer contains the termination characters" do
         class MyStream < Stream
           def connect; end
           def connected?; true; end

data/spec/system/system_spec.rb

@@ -41,43 +41,43 @@ module Cosmos
     end
 
     describe "instance" do
-      it "should create default ports" do
+      it "creates default ports" do
         # Don't check the actual port numbers but just that they exist
-        System.ports.keys.should eql %w(CTS_API TLMVIEWER_API CTS_PREIDENTIFIED)
+        expect(System.ports.keys).to eql %w(CTS_API TLMVIEWER_API CTS_PREIDENTIFIED)
       end
 
-      it "should create default paths" do
+      it "creates default paths" do
         # Don't check the actual paths but just that they exist
-        System.paths.keys.should eql %w(LOGS TMP SAVED_CONFIG TABLES HANDBOOKS PROCEDURES)
+        expect(System.paths.keys).to eql %w(LOGS TMP SAVED_CONFIG TABLES HANDBOOKS PROCEDURES)
       end
     end
 
     describe "System.commands" do
-      it "should only contain UNKNOWN" do
-        System.commands.target_names.should eql ["UNKNOWN"]
+      it "is empty" do
+        expect(System.commands.target_names).to eql []
       end
 
-      it "should log errors saving the configuration" do
+      it "logs errors saving the configuration" do
         # Force a reload of the configuration
         System.class_eval('@@instance = nil')
 
         capture_io do |stdout|
           allow(FileUtils).to receive(:mkdir_p) { raise "Error" }
-          System.commands.target_names.should eql ["UNKNOWN"]
-          stdout.string.should match "Problem saving configuration"
+          expect(System.commands.target_names).to eql []
+          expect(stdout.string).to match "Problem saving configuration"
         end
       end
     end
 
     describe "System.telemetry" do
-      it "should only contain UNKNOWN" do
-        System.telemetry.target_names.should eql ["UNKNOWN"]
+      it "is empty" do
+        expect(System.telemetry.target_names).to eql []
       end
     end
 
     describe "System.limits" do
-      it "should include the DEFAULT limit set" do
-        System.limits.sets.should include :DEFAULT
+      it "includes the DEFAULT limit set" do
+        expect(System.limits.sets).to include :DEFAULT
       end
     end
 
@@ -88,7 +88,7 @@ module Cosmos
       end
 
       describe "System.clear_counters" do
-        it "should clear the target, command and telemetry counters" do
+        it "clears the target, command and telemetry counters" do
           System.targets.each do |name, tgt|
             tgt.cmd_cnt = 100
             tgt.tlm_cnt = 100
@@ -103,46 +103,46 @@ module Cosmos
           System.clear_counters
 
           System.targets.each do |name, tgt|
-            tgt.cmd_cnt.should eql 0
-            tgt.tlm_cnt.should eql 0
+            expect(tgt.cmd_cnt).to eql 0
+            expect(tgt.tlm_cnt).to eql 0
           end
           System.commands.all do |tgt, pkt|
-            pkt.received_count.should eql 0
+            expect(pkt.received_count).to eql 0
           end
           System.telemetry.all do |tgt, pkt|
-            pkt.received_count.should eql 0
+            expect(pkt.received_count).to eql 0
           end
         end
       end
 
       describe "packets and System.packets" do
-        it "should calculate MD5s across all the target files" do
+        it "calculates MD5s across all the target files" do
           capture_io do |stdout|
             # This line actually does the work of reading the configuration
-            System.telemetry.target_names.should eql ['COSMOS','INST','META','UNKNOWN']
-            System.commands.target_names.should eql ['COSMOS','INST','META','UNKNOWN']
+            expect(System.telemetry.target_names).to eql ['COSMOS','INST','META']
+            expect(System.commands.target_names).to eql ['COSMOS','INST','META']
 
-            stdout.string.should match "Marshal file does not exist"
+            expect(stdout.string).to match "Marshal file does not exist"
 
             # Reset stdout for another go at the processing
             stdout.rewind
             # Reset the instance variable so it will read the new configuration
             System.class_eval('@@instance = nil')
             # This line actually does the work of reading the configuration
-            System.telemetry.target_names.should eql ['COSMOS','INST','META','UNKNOWN']
-            System.commands.target_names.should eql ['COSMOS','INST','META','UNKNOWN']
+            expect(System.telemetry.target_names).to eql ['COSMOS','INST','META']
+            expect(System.commands.target_names).to eql ['COSMOS','INST','META']
 
-            stdout.string.should match "Marshal load success"
+            expect(stdout.string).to match "Marshal load success"
           end
         end
 
-        it "should handle target parsing errors" do
+        it "handles target parsing errors" do
           capture_io do |stdout|
             allow_any_instance_of(PacketConfig).to receive(:process_file) { raise "ProcessError" }
             # This line actually does the work of reading the configuration
-            expect { System.telemetry.target_names.should eql ['COSMOS','INST','META','UNKNOWN'] }.to raise_error("ProcessError")
+            expect { System.telemetry.target_names }.to raise_error("ProcessError")
 
-            stdout.string.should match "Problem processing"
+            expect(stdout.string).to match "Problem processing"
           end
         end
       end
@@ -153,13 +153,13 @@ module Cosmos
           File.delete(File.join(@config_targets,'COSMOS','cmd_tlm','test2_tlm.txt'))
         end
 
-        it "should load the initial configuration" do
+        it "loads the initial configuration" do
           System.load_configuration
-          System.commands.target_names.should eql ['COSMOS','INST','META','UNKNOWN']
-          System.telemetry.target_names.should eql ['COSMOS','INST','META','UNKNOWN']
+          expect(System.commands.target_names).to eql ['COSMOS','INST','META']
+          expect(System.telemetry.target_names).to eql ['COSMOS','INST','META']
         end
 
-        it "should load a named configuration" do
+        it "loads a named configuration" do
           File.open(@config_file,'w') do |file|
             file.puts "DECLARE_TARGET COSMOS"
             file.puts "DECLARE_TARGET COSMOS OVERRIDE"
@@ -167,7 +167,7 @@ module Cosmos
 
           # Load the original configuration
           original_config_name = System.load_configuration()
-          System.telemetry.target_names.should eql %w(COSMOS OVERRIDE UNKNOWN)
+          expect(System.telemetry.target_names).to eql %w(COSMOS OVERRIDE)
           original_pkts = System.telemetry.packets('COSMOS').keys
 
           # Create a new configuration by writing another telemetry file
@@ -177,13 +177,13 @@ module Cosmos
           end
           System.instance.process_file(@config_file)
           # Verify the new telemetry packet is there
-          System.telemetry.packets('COSMOS').keys.should include "TEST1"
+          expect(System.telemetry.packets('COSMOS').keys).to include "TEST1"
           second_config_name = System.configuration_name
 
           # Now load the original configuration
           name = System.load_configuration(original_config_name)
-          original_config_name.should eql name
-          System.telemetry.packets('COSMOS').keys.should_not include "TEST1"
+          expect(original_config_name).to eql name
+          expect(System.telemetry.packets('COSMOS').keys).not_to include "TEST1"
 
           # Create yet another configuration by writing another telemetry file
           File.open(File.join(@config_targets,'COSMOS','cmd_tlm','test2_tlm.txt'),'w') do |file|
@@ -193,19 +193,19 @@ module Cosmos
           System.instance.process_file(@config_file)
           names = []
           # Verify the new telemetry packet is there as well as the second one
-          System.telemetry.packets('COSMOS').keys.should include("TEST1", "TEST2")
+          expect(System.telemetry.packets('COSMOS').keys).to include("TEST1", "TEST2")
           third_config_name = System.configuration_name
 
           # Try loading something that doesn't exist
           # It should fail and reload the original configuration
           name = System.load_configuration("BLAH")
-          name.should eql original_config_name
+          expect(name).to eql original_config_name
 
           # Now load the second configuration. It shouldn't have the most
           # recently defined telemetry packet.
           System.load_configuration(second_config_name)
-          System.telemetry.packets('COSMOS').keys.should include "TEST1"
-          System.telemetry.packets('COSMOS').keys.should_not include "TEST2"
+          expect(System.telemetry.packets('COSMOS').keys).to include "TEST1"
+          expect(System.telemetry.packets('COSMOS').keys).not_to include "TEST2"
         end
       end
     end
@@ -228,7 +228,7 @@ module Cosmos
         FileUtils.mv File.join(Cosmos::USERPATH, 'targets'), File.join(Cosmos::USERPATH, 'config')
       end
 
-      it "should complain about unknown keywords" do
+      it "complains about unknown keywords" do
         tf = Tempfile.new('unittest')
         tf.puts("BLAH")
         tf.close
@@ -237,7 +237,7 @@ module Cosmos
       end
 
       context "with AUTO_DECLARE_TARGETS" do
-        it "should take 0 parameters" do
+        it "takes 0 parameters" do
           tf = Tempfile.new('unittest')
           tf.puts("AUTO_DECLARE_TARGETS TRUE")
           tf.close
@@ -245,7 +245,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should complain if config/targets doesn't exist" do
+        it "complains if config/targets doesn't exist" do
           tf = Tempfile.new('unittest')
           tf.puts("AUTO_DECLARE_TARGETS")
           tf.close
@@ -255,7 +255,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should complain if target directories aren't uppercase" do
+        it "complains if target directories aren't uppercase" do
           tf = Tempfile.new('unittest')
           tf.puts("AUTO_DECLARE_TARGETS")
           tf.close
@@ -265,7 +265,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should process target directories with the SYSTEM directory last" do
+        it "processes target directories with the SYSTEM directory last" do
           tf = Tempfile.new('unittest')
           tf.puts("AUTO_DECLARE_TARGETS")
           tf.close
@@ -275,7 +275,7 @@ module Cosmos
           System.instance.process_file(tf.path)
           # Since Ruby 1.9+ uses ordered Hashes we can ask for the keys and
           # SYSTEM should be last
-          System.instance.targets.keys.should eql %w(ABC XYZ SYSTEM)
+          expect(System.instance.targets.keys).to eql %w(ABC XYZ SYSTEM)
           Dir.rmdir(File.join(@config_targets, 'ABC'))
           Dir.rmdir(File.join(@config_targets, 'SYSTEM'))
           Dir.rmdir(File.join(@config_targets, 'XYZ'))
@@ -284,7 +284,7 @@ module Cosmos
       end
 
       context "with DECLARE_TARGET" do
-        it "should take 1 or 2 parameters" do
+        it "takes 1 or 2 parameters" do
           tf = Tempfile.new('unittest')
           tf.puts("DECLARE_TARGET")
           tf.close
@@ -298,7 +298,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should complain if the target directory doesn't exist" do
+        it "complains if the target directory doesn't exist" do
           tf = Tempfile.new('unittest')
           tf.puts("DECLARE_TARGET TGT")
           tf.close
@@ -306,7 +306,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should process the target directory" do
+        it "processes the target directory" do
           tf = Tempfile.new('unittest')
           tf.puts("DECLARE_TARGET TGT")
           tf.close
@@ -315,7 +315,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should process the target directory with substitute name" do
+        it "processes the target directory with substitute name" do
           tf = Tempfile.new('unittest')
           tf.puts("DECLARE_TARGET TGT NEW")
           tf.close
@@ -324,7 +324,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should process the target directory with specified target.txt" do
+        it "processes the target directory with specified target.txt" do
           tf = Tempfile.new('unittest')
           tf.puts("DECLARE_TARGET TGT nil target.txt")
           tf.close
@@ -338,7 +338,7 @@ module Cosmos
       end
 
       context "with PORT" do
-        it "should take 2 parameters" do
+        it "takes 2 parameters" do
           tf = Tempfile.new('unittest')
           tf.puts("PORT CTS_API")
           tf.close
@@ -352,30 +352,30 @@ module Cosmos
           tf.unlink
         end
 
-        it "should complain about unknown ports" do
+        it "complains about unknown ports" do
           tf = Tempfile.new('unittest')
           tf.puts("PORT MYPORT 10")
           tf.close
           capture_io do |stdout|
             System.instance.process_file(tf.path)
-            stdout.string.should match /WARN: Unknown port name given: MYPORT/
+            expect(stdout.string).to match /WARN: Unknown port name given: MYPORT/
           end
           tf.unlink
         end
 
-        it "should change known ports" do
+        it "changes known ports" do
           tf = Tempfile.new('unittest')
           tf.puts("PORT CTS_API 8888")
           tf.close
-          System.ports['CTS_API'].should eql 7777
+          expect(System.ports['CTS_API']).to eql 7777
           System.instance.process_file(tf.path)
-          System.ports['CTS_API'].should eql 8888
+          expect(System.ports['CTS_API']).to eql 8888
           tf.unlink
         end
       end
 
       context "with PATH" do
-        it "should take 2 parameters" do
+        it "takes 2 parameters" do
           tf = Tempfile.new('unittest')
           tf.puts("PATH C:/")
           tf.close
@@ -389,32 +389,32 @@ module Cosmos
           tf.unlink
         end
 
-        it "should complain about unknown paths" do
+        it "complains about unknown paths" do
           tf = Tempfile.new('unittest')
           tf.puts("PATH MYPATH C:/")
           tf.close
           capture_io do |stdout|
             System.instance.process_file(tf.path)
-            stdout.string.should match /WARN: Unknown path name given: MYPATH/
+            expect(stdout.string).to match /WARN: Unknown path name given: MYPATH/
           end
           tf.unlink
         end
 
-        it "should change known paths" do
+        it "changes known paths" do
           if Kernel.is_windows?
             tf = Tempfile.new('unittest')
             tf.puts("PATH LOGS C:/mylogs")
             tf.close
-            System.paths['LOGS'].should match 'outputs/logs'
+            expect(System.paths['LOGS']).to match 'outputs/logs'
             System.instance.process_file(tf.path)
-            System.paths['LOGS'].should eql 'C:/mylogs'
+            expect(System.paths['LOGS']).to eql 'C:/mylogs'
             tf.unlink
           end
         end
       end
 
       context "with DEFAULT_PACKET_LOG_WRITER" do
-        it "should take 1 parameters" do
+        it "takes 1 parameters" do
           tf = Tempfile.new('unittest')
           tf.puts("DEFAULT_PACKET_LOG_WRITER")
           tf.close
@@ -428,7 +428,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should complain if the class doesn't exist" do
+        it "complains if the class doesn't exist" do
           tf = Tempfile.new('unittest')
           tf.puts("DEFAULT_PACKET_LOG_WRITER my_nonexistent_class")
           tf.close
@@ -436,7 +436,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should set the packet writer" do
+        it "sets the packet writer" do
           filename = File.join(File.dirname(__FILE__),'..','..','lib','my_writer.rb')
           File.open(filename, 'w') do |file|
             file.puts "class MyWriter"
@@ -446,14 +446,14 @@ module Cosmos
           tf.puts("DEFAULT_PACKET_LOG_WRITER my_writer")
           tf.close
           System.instance.process_file(tf.path)
-          System.default_packet_log_writer.should eql MyWriter
+          expect(System.default_packet_log_writer).to eql MyWriter
           File.delete filename
           tf.unlink
         end
       end
 
       context "with DEFAULT_PACKET_LOG_READER" do
-        it "should take 1 parameters" do
+        it "takes 1 parameters" do
           tf = Tempfile.new('unittest')
           tf.puts("DEFAULT_PACKET_LOG_READER")
           tf.close
@@ -467,7 +467,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should complain if the class doesn't exist" do
+        it "complains if the class doesn't exist" do
           tf = Tempfile.new('unittest')
           tf.puts("DEFAULT_PACKET_LOG_READER my_nonexistent_class")
           tf.close
@@ -475,7 +475,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should set the packet reader" do
+        it "sets the packet reader" do
           filename = File.join(File.dirname(__FILE__),'..','..','lib','my_reader.rb')
           File.open(filename, 'w') do |file|
             file.puts "class MyReader"
@@ -485,14 +485,14 @@ module Cosmos
           tf.puts("DEFAULT_PACKET_LOG_READER my_reader")
           tf.close
           System.instance.process_file(tf.path)
-          System.default_packet_log_reader.should eql MyReader
+          expect(System.default_packet_log_reader).to eql MyReader
           File.delete filename
           tf.unlink
         end
       end
 
       context "with DISABLE_DNS" do
-        it "should take 0 parameters" do
+        it "takes 0 parameters" do
           tf = Tempfile.new('unittest')
           tf.puts("DISABLE_DNS BLAH TRUE")
           tf.close
@@ -500,19 +500,19 @@ module Cosmos
           tf.unlink
         end
 
-        it "should disable dns lookups" do
+        it "disables dns lookups" do
           tf = Tempfile.new('unittest')
           tf.puts("DISABLE_DNS")
           tf.close
-          System.use_dns.should be_truthy
+          expect(System.use_dns).to be_truthy
           System.instance.process_file(tf.path)
-          System.use_dns.should be_falsey
+          expect(System.use_dns).to be_falsey
           tf.unlink
         end
       end
 
       context "with ALLOW_ACCESS" do
-        it "should take 1 parameters" do
+        it "takes 1 parameters" do
           tf = Tempfile.new('unittest')
           tf.puts("ALLOW_ACCESS")
           tf.close
@@ -526,7 +526,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "should complain about bad addresses" do
+        it "complains about bad addresses" do
           tf = Tempfile.new('unittest')
           tf.puts("ALLOW_ACCESS blah")
           tf.close
@@ -540,39 +540,39 @@ module Cosmos
           tf.unlink
         end
 
-        it "should allow ALL" do
+        it "allows ALL" do
           tf = Tempfile.new('unittest')
           tf.puts("ALLOW_ACCESS ALL")
           tf.close
           System.instance.process_file(tf.path)
-          System.acl.should be_nil
+          expect(System.acl).to be_nil
           tf.unlink
         end
 
-        it "should store host by name" do
+        it "stores host by name" do
           tf = Tempfile.new('unittest')
           tf.puts("ALLOW_ACCESS localhost")
           tf.close
           System.instance.process_file(tf.path)
-          System.acl.allow_addr?(["AF_INET",0,"localhost","127.0.0.1"]).should be_truthy
+          expect(System.acl.allow_addr?(["AF_INET",0,"localhost","127.0.0.1"])).to be_truthy
           tf.unlink
         end
 
-        it "should store host by IP address" do
+        it "stores host by IP address" do
           addr = IPSocket.getaddress("www.google.com")
           if addr and !addr.index(':')
             tf = Tempfile.new('unittest')
             tf.puts("ALLOW_ACCESS #{addr}")
             tf.close
             System.instance.process_file(tf.path)
-            System.acl.allow_addr?(["AF_INET",0,"www.google.com",addr]).should be_truthy
+            expect(System.acl.allow_addr?(["AF_INET",0,"www.google.com",addr])).to be_truthy
             tf.unlink
           end
         end
       end
 
       context "with STALENESS_SECONDS" do
-        it "should take 1 parameters" do
+        it "takes 1 parameters" do
           tf = Tempfile.new('unittest')
           tf.puts("STALENESS_SECONDS")
           tf.close
@@ -586,19 +586,19 @@ module Cosmos
           tf.unlink
         end
 
-        it "should set the number of seconds required to be stale" do
+        it "sets the number of seconds required to be stale" do
           tf = Tempfile.new('unittest')
           tf.puts("STALENESS_SECONDS 3")
           tf.close
-          System.staleness_seconds.should eql 30
+          expect(System.staleness_seconds).to eql 30
           System.instance.process_file(tf.path)
-          System.staleness_seconds.should eql 3
+          expect(System.staleness_seconds).to eql 3
           tf.unlink
         end
       end
 
       context "with CMD_TLM_VERSION" do
-        it "should take 1 parameters" do
+        it "takes 1 parameters" do
           tf = Tempfile.new('unittest')
           tf.puts("CMD_TLM_VERSION")
           tf.close
@@ -612,31 +612,31 @@ module Cosmos
           tf.unlink
         end
 
-        it "should set the command and telemetry version" do
+        it "sets the command and telemetry version" do
           tf = Tempfile.new('unittest')
           tf.puts("CMD_TLM_VERSION 2.1")
           tf.close
-          System.cmd_tlm_version.should be_nil
+          expect(System.cmd_tlm_version).to be_nil
           System.instance.process_file(tf.path)
-          System.cmd_tlm_version.should eql "2.1"
+          expect(System.cmd_tlm_version).to eql "2.1"
           tf.unlink
         end
       end
     end
 
     describe "Cosmos.write_exception_file" do
-      it "should write a file with the exception" do
+      it "writes a file with the exception" do
         filename = Cosmos.write_exception_file(RuntimeError.new("HELP!"))
-        File.exist?(filename).should be_truthy
+        expect(File.exist?(filename)).to be_truthy
         File.delete(filename)
       end
 
-      it "should write a file without a defined LOGS directory" do
+      it "writes a file without a defined LOGS directory" do
         File.open(@config_file,'w') {|file| file.puts "PATH LOGS C:/this/is/not/a/real/path" }
         # Reset the instance variable so it will read the new config file
         System.instance_eval('@instance = nil')
         filename = Cosmos.write_exception_file(RuntimeError.new("HELP!"))
-        File.exist?(filename).should be_truthy
+        expect(File.exist?(filename)).to be_truthy
         File.delete(filename)
       end
     end