spec/timber/log_devices/http_spec.rb in timber-1.0.8 vs spec/timber/log_devices/http_spec.rb in timber-1.0.9

@@ -1,85 +1,104 @@
 require "spec_helper"
 
 describe Timber::LogDevices::HTTP do
   describe "#initialize" do
-    it "should start a thread for delivery" do
-      expect_any_instance_of(described_class).to receive(:deliver).at_least(1).times.and_return(true)
-      http = described_class.new("MYKEY", delivery_frequency_seconds: 0.1)
-      thread = http.instance_variable_get(:@delivery_interval_thread)
+    it "should initialize properly" do
+      http = described_class.new("MYKEY", flush_interval: 0.1)
+      thread = http.instance_variable_get(:@flush_thread)
       expect(thread).to be_alive
-
-      http.write("my log message")
-      sleep 0.3 # too fast!
+      thread = http.instance_variable_get(:@flush_thread)
+      expect(thread).to be_alive
     end
   end
 
   describe "#write" do
     let(:http) { described_class.new("MYKEY") }
-    let(:buffer) { http.instance_variable_get(:@buffer) }
+    let(:msg_queue) { http.instance_variable_get(:@msg_queue) }
 
     it "should buffer the messages" do
       http.write("test log message")
-      expect(buffer.reserve).to eq("test log message")
+      expect(msg_queue.flush).to eq(["test log message"])
     end
 
-    context "with a low payload limit" do
-      let(:http) { described_class.new("MYKEY", :payload_limit_bytes => 20) }
+    context "with a low batch byte size" do
+      let(:http) { described_class.new("MYKEY", :batch_byte_size => 20) }
 
       it "should attempt a delivery when the payload limit is exceeded" do
         message = "a" * 19
         http.write(message)
-        expect(http).to receive(:deliver).exactly(1).times.with(message)
+        expect(http).to receive(:flush).exactly(1).times
         http.write("my log message")
       end
     end
   end
 
   describe "#close" do
     let(:http) { described_class.new("MYKEY") }
 
-    it "should kill the delivery thread the messages" do
+    it "should kill the threads" do
       http.close
-      thread = http.instance_variable_get(:@delivery_interval_thread)
+      thread = http.instance_variable_get(:@flush_thread)
       sleep 0.1 # too fast!
       expect(thread).to_not be_alive
+      thread = http.instance_variable_get(:@outlet_thread)
+      sleep 0.1 # too fast!
+      expect(thread).to_not be_alive
     end
 
     it "should attempt a delivery" do
       message = "a" * 19
       http.write(message)
-      expect(http).to receive(:deliver).exactly(1).times.with(message)
+      expect(http).to receive(:flush).exactly(1).times
       http.close
     end
   end
 
-  describe "#deliver" do
-    let(:http) { described_class.new("MYKEY") }
+  # Testing a private method because it helps break down our tests
+  describe "#flush" do
+    it "should add a request to the queue" do
+      http = described_class.new("MYKEY", threads: false)
+      http.write("This is a log message")
+      http.send(:flush)
+      request_queue = http.instance_variable_get(:@request_queue)
+      request = request_queue.deq
+      expect(request).to be_kind_of(Net::HTTP::Post)
+      expect(request.body).to eq("This is a log message")
 
-    after(:each) { http.close }
+      message_queue = http.instance_variable_get(:@msg_queue)
+      expect(message_queue.size).to eq(0)
+    end
+  end
 
-    it "should delivery properly and flush the buffer" do
+  # Testing a private method because it helps break down our tests
+  describe "#intervaled_flush" do
+    it "should start a intervaled flush thread and flush on an interval" do
+      http = described_class.new("MYKEY", flush_interval: 0.1)
+      expect(http).to receive(:flush).exactly(1).times
+      sleep 0.15 # too fast!
+      mock = expect(http).to receive(:flush).exactly(1).times
+      sleep 0.15 # too fast!
+    end
+  end
+
+  # Outlet
+  describe "#outlet" do
+    it "should start a intervaled flush thread and flush on an interval" do
       stub = stub_request(:post, "https://logs.timber.io/frames").
         with(
-          :body => "test log message",
+          :body => 'test log message',
           :headers => {
             'Authorization' => 'Basic TVlLRVk=',
-            'Connection' => 'keep-alive',
             'Content-Type' => 'application/x-timber-msgpack-frame-1',
             'User-Agent' => "Timber Ruby Gem/#{Timber::VERSION}"
           }
         ).
         to_return(:status => 200, :body => "", :headers => {})
 
+      http = described_class.new("MYKEY", flush_interval: 0.1)
       http.write("test log message")
-      buffer = http.instance_variable_get(:@buffer)
-      buffers = buffer.instance_variable_get(:@buffers)
-      expect(buffers.size).to eq(1)
-      body = buffer.reserve
-      thread = http.send(:deliver, body)
-      thread.join
+      sleep 0.2
 
       expect(stub).to have_been_requested.times(1)
-      expect(buffers.size).to eq(0)
     end
   end
 end
\ No newline at end of file