pubnub 4.4.0 → 4.5.0

data/spec/lib/connection_callback_spec.rb

@@ -7,6 +7,7 @@ describe "Connect, disconnect and reconnect callbacks" do
 
   before(:each) do
     @connect_messages, @reconnect_messages, @disconnect_messages = [], [], []
+    @sleep_duration = ENV['JRUBY_TEST'] == 'true' ? 1.5 : 0.5
 
     callback = Pubnub::SubscribeCallback.new(
       message: -> (_envelope) { },
@@ -37,7 +38,7 @@ describe "Connect, disconnect and reconnect callbacks" do
   it "fire connect callback when connection is made" do
     VCR.use_cassette("client/connection_callbacks_0", :record => :once) do
       @pubnub.subscribe(channel: :demo)
-      sleep 0.5
+      sleep @sleep_duration
       expect(@connect_messages.size).to be > 0
     end
   end
@@ -47,7 +48,7 @@ describe "Connect, disconnect and reconnect callbacks" do
 
     VCR.use_cassette("client/connection_callbacks_1", :record => :once) do
       @pubnub.subscribe(channel: :demo)
-      sleep 0.5
+      sleep @sleep_duration
       expect(@disconnect_messages.size).to be > 0
     end
   end
@@ -57,7 +58,7 @@ describe "Connect, disconnect and reconnect callbacks" do
 
     VCR.use_cassette("client/connection_callbacks_2", :record => :once) do
       @pubnub.subscribe(channel: :demo)
-      sleep 0.5
+      sleep @sleep_duration
       expect(@reconnect_messages.size).to be > 0
     end
   end

data/spec/lib/events/membership_spec.rb

@@ -10,7 +10,7 @@ describe Pubnub::SetMemberships do
         publish_key: "pub-a-mock-key",
         auth_key: "ruby-test-auth",
         uuid: "ruby-test-uuid",
-        )
+      )
     end
 
     it "get_channel_members_works" do
@@ -22,8 +22,8 @@ describe Pubnub::SetMemberships do
       end
     end
 
-    it "get_memberships_works" do
-      VCR.use_cassette("lib/events/get_memberships", record: :once) do
+    it "get_memberships_works_1" do
+      VCR.use_cassette("lib/events/get_memberships1", record: :once) do
         envelope = @pubnub.get_memberships(uuid: "mg3", include: { count: true, custom: true }).value
 
         expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
@@ -31,18 +31,45 @@ describe Pubnub::SetMemberships do
       end
     end
 
-    it "set_memberships_works" do
-      VCR.use_cassette("lib/events/set_memberships", record: :once) do
-        envelope = @pubnub.set_memberships(uuid: "mg3", channels: [{ 'channel': 'channel-1'}], include: { custom: true }).value
+    it "get_memberships_works_2" do
+      VCR.use_cassette("lib/events/get_memberships2", record: :once) do
+        envelope = @pubnub.get_memberships(include: { count: true, custom: true }).value
 
         expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
         expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
       end
     end
 
-    it "remove_memberships_works" do
-      VCR.use_cassette("lib/events/remove_memberships", record: :once) do
-        envelope = @pubnub.remove_memberships(uuid: "mg3", channels: [{ 'channel': 'channel-1'}], include: { custom: true }).value
+    it "set_memberships_works_1" do
+      VCR.use_cassette("lib/events/set_memberships1", record: :once) do
+        envelope = @pubnub.set_memberships(uuid: "mg3", channels: [{ channel: 'channel-1'}], include: { custom: true }).value
+
+        expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+        expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+      end
+    end
+
+    it "set_memberships_works_2" do
+      VCR.use_cassette("lib/events/set_memberships2", record: :once) do
+        envelope = @pubnub.set_memberships(channels: [{ channel: 'channel-1'}], include: { custom: true }).value
+
+        expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+        expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+      end
+    end
+
+    it "remove_memberships_works_1" do
+      VCR.use_cassette("lib/events/remove_memberships1", record: :once) do
+        envelope = @pubnub.remove_memberships(uuid: "mg3", channels: ['channel-1'], include: { custom: true }).value
+
+        expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+        expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+      end
+    end
+
+    it "remove_memberships_works_2" do
+      VCR.use_cassette("lib/events/remove_memberships2", record: :once) do
+        envelope = @pubnub.remove_memberships(channels: ['channel-1'], include: { custom: true }).value
 
         expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
         expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
@@ -51,7 +78,7 @@ describe Pubnub::SetMemberships do
 
     it "set_channel_members_works" do
       VCR.use_cassette("lib/events/set_channel_members", record: :once) do
-        envelope = @pubnub.set_channel_members(channel: "channel-1", uuids: [{'uuid': 'mg2'}], include: { custom: true }).value
+        envelope = @pubnub.set_channel_members(channel: "channel-1", uuids: [{uuid: 'mg2'}], include: { custom: true }).value
 
         expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
         expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
@@ -60,7 +87,7 @@ describe Pubnub::SetMemberships do
 
     it "remove_channel_members_works" do
       VCR.use_cassette("lib/events/remove_channel_members", record: :once) do
-        envelope = @pubnub.remove_channel_members(channel: "channel-1", uuids: [{'uuid': 'mg2'}], include: { custom: true }).value
+        envelope = @pubnub.remove_channel_members(channel: "channel-1", uuids: ['mg2'], include: { custom: true }).value
 
         expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
         expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new

data/spec/lib/events/presence_delta_spec.rb

@@ -8,12 +8,12 @@ describe Pubnub::Presence do
 
   context "with interval events and delta" do
     before :each do
-      @messages = []
+      @presences = []
       @statuses = []
 
       @callbacks = Pubnub::SubscribeCallback.new(
         message: -> (_envelope) { },
-        presence: -> (envelope) { @messages << envelope },
+        presence: -> (envelope) { @presences << envelope },
         status: -> (envelope) { @statuses << envelope },
       )
     end
@@ -26,10 +26,13 @@ describe Pubnub::Presence do
         pubnub.presence(channel: :demo)
 
         eventually do
-          expect(@messages[0].result[:data]).to eq({:message => {"action" => "interval", "timestamp" => 1490958575, "occupancy" => 3}, :subscribed_channel => "demo-pnpres", :actual_channel => "demo-pnpres", :publish_time_object => {:timetoken => "14909585750910131", :region_code => 1}, :message_meta_data => nil, :presence_event => "interval", :presence => {:uuid => nil, :timestamp => 1490958575, :state => nil, :occupancy => 3}})
-          expect(@messages[1].result[:data]).to eq({:message => {"action" => "interval", "timestamp" => 1490958585, "occupancy" => 4, "join" => ["Client-d39lr"]}, :subscribed_channel => "demo-pnpres", :actual_channel => "demo-pnpres", :publish_time_object => {:timetoken => "14909585850925693", :region_code => 1}, :message_meta_data => nil, :presence_event => "interval", :presence => {:uuid => nil, :timestamp => 1490958585, :state => nil, :occupancy => 4}})
-          expect(@messages[2].result[:data]).to eq({:message => {"action" => "interval", "timestamp" => 1490958595, "occupancy" => 3, "leave" => ["another-client"]}, :subscribed_channel => "demo-pnpres", :actual_channel => "demo-pnpres", :publish_time_object => {:timetoken => "14909585950916556", :region_code => 1}, :message_meta_data => nil, :presence_event => "interval", :presence => {:uuid => nil, :timestamp => 1490958595, :state => nil, :occupancy => 3}})
-          expect(@messages[3].result[:data]).to eq({:message => {"action" => "interval", "timestamp" => 1490958605, "occupancy" => 2, "join" => ["another-client"], "leave" => ["Client-d39lr", "client0"]}, :subscribed_channel => "demo-pnpres", :actual_channel => "demo-pnpres", :publish_time_object => {:timetoken => "14909586050915528", :region_code => 1}, :message_meta_data => nil, :presence_event => "interval", :presence => {:uuid => nil, :timestamp => 1490958605, :state => nil, :occupancy => 2}})
+          if @presences.length >= 4
+            expect(@presences[0].result[:data]).to eq({:message => {"action" => "interval", "timestamp" => 1490958575, "occupancy" => 3}, :subscribed_channel => "demo-pnpres", :actual_channel => "demo-pnpres", :publish_time_object => {:timetoken => "14909585750910131", :region_code => 1}, :message_meta_data => nil, :presence_event => "interval", :presence => {:uuid => nil, :timestamp => 1490958575, :state => nil, :occupancy => 3}})
+            expect(@presences[1].result[:data]).to eq({:message => {"action" => "interval", "timestamp" => 1490958585, "occupancy" => 4, "join" => ["Client-d39lr"]}, :subscribed_channel => "demo-pnpres", :actual_channel => "demo-pnpres", :publish_time_object => {:timetoken => "14909585850925693", :region_code => 1}, :message_meta_data => nil, :presence_event => "interval", :presence => {:uuid => nil, :timestamp => 1490958585, :state => nil, :occupancy => 4}})
+            expect(@presences[2].result[:data]).to eq({:message => {"action" => "interval", "timestamp" => 1490958595, "occupancy" => 3, "leave" => ["another-client"]}, :subscribed_channel => "demo-pnpres", :actual_channel => "demo-pnpres", :publish_time_object => {:timetoken => "14909585950916556", :region_code => 1}, :message_meta_data => nil, :presence_event => "interval", :presence => {:uuid => nil, :timestamp => 1490958595, :state => nil, :occupancy => 3}})
+            expect(@presences[3].result[:data]).to eq({:message => {"action" => "interval", "timestamp" => 1490958605, "occupancy" => 2, "join" => ["another-client"], "leave" => ["Client-d39lr", "client0"]}, :subscribed_channel => "demo-pnpres", :actual_channel => "demo-pnpres", :publish_time_object => {:timetoken => "14909586050915528", :region_code => 1}, :message_meta_data => nil, :presence_event => "interval", :presence => {:uuid => nil, :timestamp => 1490958605, :state => nil, :occupancy => 2}})
+            true
+          end
         end
       end
     end

data/spec/lib/events/presence_spec.rb

@@ -4,7 +4,7 @@ describe Pubnub::Presence do
   around :each do |example|
     example.run_with_retry retry: 10
   end
-  
+
   it_behaves_like "an event"
 
   context "given basic parameters" do
@@ -34,9 +34,12 @@ describe Pubnub::Presence do
           @pubnub.presence(channel: :demo)
 
           eventually do
-            envelope = @messages.first
-            expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
-            expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+            if @messages.length > 0
+              envelope = @messages.first
+              expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+              expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+              true
+            end
           end
         end
       end
@@ -56,9 +59,12 @@ describe Pubnub::Presence do
           sleep 0.1
 
           eventually do
-            envelope = @statuses.first
-            expect(envelope).to be_a_kind_of Pubnub::ErrorEnvelope
-            # expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema
+            if @statuses.length > 0
+              envelope = @statuses.first
+              expect(envelope).to be_a_kind_of Pubnub::ErrorEnvelope
+              # expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema
+              true
+            end
           end
         end
       end

data/spec/lib/events/subscribe_spec.rb

@@ -53,9 +53,12 @@ describe Pubnub::Subscribe do
           @pubnub.subscribe(channel: :demo)
 
           eventually do
-            envelope = @messages.first
-            expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
-            expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+            if @messages.length > 0
+              envelope = @messages.first
+              expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+              expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+              true
+            end
           end
         end
       end
@@ -74,7 +77,10 @@ describe Pubnub::Subscribe do
           @pubnub.subscribe(channel: :whatever)
 
           eventually do
-            expect(@messages.first.result[:data][:message]).to eq("text" => "hey")
+            if @messages.length > 0
+              expect(@messages.first.result[:data][:message]).to eq("text" => "hey")
+              true
+            end
           end
         end
       end
@@ -110,9 +116,12 @@ describe Pubnub::Subscribe do
           sleep 0.1
 
           eventually do
-            envelope = @statuses.first
-            expect(envelope).to be_a_kind_of Pubnub::ErrorEnvelope
-            expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+            if @statuses.length > 0
+              envelope = @statuses.first
+              expect(envelope).to be_a_kind_of Pubnub::ErrorEnvelope
+              expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+              true
+            end
           end
         end
       end
@@ -131,12 +140,15 @@ describe Pubnub::Subscribe do
           @pubnub.subscribe(channel: :uuid_mg3)
 
           eventually do
-            envelope = @uuid_metadata_events.first
-            expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
-            expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
-            expect(envelope.result[:data][:message]['event']).to eq 'set'
-            expect(envelope.result[:data][:message]['type']).to eq 'uuid'
-            expect(envelope.result[:data][:message]['data']['id']).to eq 'uuid_mg3'
+            if @uuid_metadata_events.length > 0
+              envelope = @uuid_metadata_events.first
+              expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+              expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+              expect(envelope.result[:data][:message]['event']).to eq 'set'
+              expect(envelope.result[:data][:message]['type']).to eq 'uuid'
+              expect(envelope.result[:data][:message]['data']['id']).to eq 'uuid_mg3'
+              true
+            end
           end
         end
       end
@@ -155,12 +167,15 @@ describe Pubnub::Subscribe do
           @pubnub.subscribe(channel: :rb_channel_3)
 
           eventually do
-            envelope = @channel_metadata_events.first
-            expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
-            expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
-            expect(envelope.result[:data][:message]['event']).to eq 'set'
-            expect(envelope.result[:data][:message]['type']).to eq 'channel'
-            # expect(envelope.result[:data][:message]['data']['id']).to eq 'rb_channel_3'
+            if @channel_metadata_events.length > 0
+              envelope = @channel_metadata_events.first
+              expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+              expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+              expect(envelope.result[:data][:message]['event']).to eq 'set'
+              expect(envelope.result[:data][:message]['type']).to eq 'channel'
+              # expect(envelope.result[:data][:message]['data']['id']).to eq 'rb_channel_3'
+              true
+            end
           end
         end
       end
@@ -179,12 +194,15 @@ describe Pubnub::Subscribe do
           @pubnub.subscribe(channel: :rb_channel_3)
 
           eventually do
-            envelope = @membership_events.first
-            expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
-            expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
-            expect(envelope.result[:data][:message]['event']).to eq 'set'
-            expect(envelope.result[:data][:message]['type']).to eq 'membership'
-            expect(envelope.result[:data][:message]['data']['uuid']['id']).to eq 'uuid_mg3'
+            if @membership_events.length > 0
+              envelope = @membership_events.first
+              expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+              expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+              expect(envelope.result[:data][:message]['event']).to eq 'set'
+              expect(envelope.result[:data][:message]['type']).to eq 'membership'
+              expect(envelope.result[:data][:message]['data']['uuid']['id']).to eq 'uuid_mg3'
+              true
+            end
           end
         end
       end
@@ -203,12 +221,15 @@ describe Pubnub::Subscribe do
           @pubnub.subscribe(channel: :uuid_mg5)
 
           eventually do
-            envelope = @membership_events.first
-            expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
-            expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
-            expect(envelope.result[:data][:message]['event']).to eq 'set'
-            expect(envelope.result[:data][:message]['type']).to eq 'membership'
-            expect(envelope.result[:data][:message]['data']['channel']['id']).to eq 'rb_channel_5'
+            if @membership_events.length > 0
+              envelope = @membership_events.first
+              expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+              expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+              expect(envelope.result[:data][:message]['event']).to eq 'set'
+              expect(envelope.result[:data][:message]['type']).to eq 'membership'
+              expect(envelope.result[:data][:message]['data']['channel']['id']).to eq 'rb_channel_5'
+              true
+            end
           end
         end
       end
@@ -229,7 +250,10 @@ describe Pubnub::Subscribe do
           @pubnub.subscribe(channel: :whatever, http_sync: true)
           @messages = @pubnub.subscribe(channel: :whatever, http_sync: true)
           eventually do
-            expect(@messages.first.result[:data][:message]).to eq("text" => "hey")
+            if @messages.length > 0
+              expect(@messages.first.result[:data][:message]).to eq("text" => "hey")
+              true
+            end
           end
         end
       end

data/spec/lib/events/uuid_metadata_spec.rb

@@ -13,8 +13,8 @@ describe Pubnub::SetUuidMetadata do
       )
     end
 
-    it "set_uuid_metadata_works" do
-      VCR.use_cassette("lib/events/set_uuid_metadata", record: :once) do
+    it "set_uuid_metadata_works_1" do
+      VCR.use_cassette("lib/events/set_uuid_metadata1", record: :once) do
         envelope = @pubnub.set_uuid_metadata(
           uuid: "mg",
           metadata: { name: "magnum", custom: { XXX: "YYYY" } },
@@ -26,8 +26,20 @@ describe Pubnub::SetUuidMetadata do
       end
     end
 
-    it "get_uuid_metadata_works" do
-      VCR.use_cassette("lib/events/get_uuid_metadata", record: :once) do
+    it "set_uuid_metadata_works_2" do
+      VCR.use_cassette("lib/events/set_uuid_metadata2", record: :once) do
+        envelope = @pubnub.set_uuid_metadata(
+          metadata: { name: "magnum", custom: { XXX: "YYYY" } },
+          include: { custom: true }
+        ).value
+
+        expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+        expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+      end
+    end
+
+    it "get_uuid_metadata_works_1" do
+      VCR.use_cassette("lib/events/get_uuid_metadata1", record: :once) do
         envelope = @pubnub.get_uuid_metadata(uuid: "mg", include: { custom: true }).value
 
         expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
@@ -35,6 +47,15 @@ describe Pubnub::SetUuidMetadata do
       end
     end
 
+    it "get_uuid_metadata_works_2" do
+      VCR.use_cassette("lib/events/get_uuid_metadata2", record: :once) do
+        envelope = @pubnub.get_uuid_metadata(include: { custom: true }).value
+
+        expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+        expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+      end
+    end
+
     it "get_all_uuid_metadata_works" do
       VCR.use_cassette("lib/events/get_all_uuid_metadata", record: :once) do
         envelope = @pubnub.get_all_uuid_metadata(limit: 5, include: { custom: true }).value
@@ -44,13 +65,22 @@ describe Pubnub::SetUuidMetadata do
       end
     end
 
-    it "remove_uuid_metadata_works" do
-      VCR.use_cassette("lib/events/remove_uuid_metadata", record: :once) do
+    it "remove_uuid_metadata_works_1" do
+      VCR.use_cassette("lib/events/remove_uuid_metadata1", record: :once) do
         envelope = @pubnub.remove_uuid_metadata(uuid: "mg").value
 
         expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
         expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
       end
     end
+
+    it "remove_uuid_metadata_works_2" do
+      VCR.use_cassette("lib/events/remove_uuid_metadata2", record: :once) do
+        envelope = @pubnub.remove_uuid_metadata.value
+
+        expect(envelope.result).to satisfies_schema Pubnub::Schemas::Envelope::ResultSchema.new
+        expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema.new
+      end
+    end
   end
 end

data/spec/lib/super_admin_spec.rb

@@ -86,8 +86,10 @@ describe "Super admin mode" do
       @pubnub.presence(channel: :demo)
 
       eventually do
-        envelope = @presences.first
-        expect(envelope.status[:client_request].to_s.index("&signature=")).to be_truthy
+        if @presences.length > 0
+          expect(@presences.first.status[:client_request].to_s.index("&signature=")).to be_truthy
+          true
+        end
       end
     end
   end
@@ -128,8 +130,10 @@ describe "Super admin mode" do
       @pubnub.subscribe(channel: :demo)
 
       eventually do
-        envelope = @messages.first
-        expect(envelope.status[:client_request].to_s.index("&signature=")).to be_truthy
+        if @messages.length > 0
+          expect(@messages.first.status[:client_request].to_s.index("&signature=")).to be_truthy
+          true
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -9,13 +9,20 @@ require "concurrent"
 require "concurrent-edge"
 require "rspec/retry"
 require "simplecov"
-SimpleCov.start do
-  add_filter "/spec/"
+
+if ENV['NO_COVERAGE'] != 'true'
+  puts "Gather Code Coverage"
+
+  SimpleCov.start do
+    add_filter "/spec/"
+  end
+else
+  puts "Skip Code Coverage"
 end
 
 require "pubnub"
 Pubnub::Constants::DEFAULT_RECONNECT_INTERVAL = 0
-if ENV["CI"] == "true"
+if ENV["CI"] == "true" && ENV['NO_COVERAGE'] != 'true'
   require "codacy-coverage"
   Codacy::Reporter.start
 end
@@ -34,13 +41,22 @@ module AsyncHelper
   def loop_it(interval, time_limit)
     loop do
       begin
-        yield
+        check_called = yield
+        check_called = false if check_called.nil?
       rescue => error
         cought_error = error
       end
-      return if cought_error.nil?
-      fail cought_error if Time.now >= time_limit
-      sleep interval
+
+      # Check whether test code in block has been called or not.
+      if (check_called.nil? || !check_called) && Time.now >= time_limit
+        cought_error = 'Eventual condition not met' if cought_error.nil?
+        fail cought_error
+        break
+      elsif !check_called.nil? && check_called
+        break
+      end
+
+      sleep(interval)
     end
   end
 end