liveqa 1.4.6 → 1.8.3

data/spec/lib/liveqa/message_spec.rb

@@ -3,9 +3,77 @@ require 'spec_helper'
 describe LiveQA::Message do
   subject(:base) { LiveQA::Message }
 
-  describe '#to_h' do
+  describe '#base' do
+    let(:expected_hash) {{
+      message_id: kind_of(String),
+      timestamp: kind_of(String),
+      session_tracker_id: kind_of(String),
+    }}
+
+    it { expect(base.base).to match(expected_hash) }
+
+    context 'with store' do
+      before do
+       LiveQA::Store.set(:session_tracker_id, 'hello')
+     end
+
+      let(:expected_hash) {{
+        message_id: kind_of(String),
+        timestamp: kind_of(String),
+        session_tracker_id: 'hello',
+      }}
+
+      it { expect(base.base).to match(expected_hash) }
+    end
+
+    context 'with metadata' do
+
+
+      let(:expected_hash) {{
+        message_id: kind_of(String),
+        timestamp: kind_of(String),
+        session_tracker_id: kind_of(String),
+        metadata: {
+          deployment_id: 42
+        }
+      }}
+
+      context 'hash type' do
+        before do
+          LiveQA.configurations.metadata = {
+            deployment_id: 42
+          }
+        end
+
+        it { expect(base.base).to match(expected_hash) }
+      end
+
+      context 'proc type' do
+        before do
+          LiveQA.configurations.metadata = {
+            deployment_id: lambda { 84 / 2 }
+          }
+        end
+
+        it { expect(base.base).to match(expected_hash) }
+      end
+
+      context 'proc & raise type' do
+        before do
+          LiveQA.configurations.metadata = {
+            deployment_id: -> { 84 / 2 },
+            other_id: -> { hello }
+          }
+        end
+
+        it { expect(base.base).to match(expected_hash) }
+      end
+    end
+
+  end
+
+  describe '#extended' do
     let(:expected_hash) {{
-      tracker_id: kind_of(String),
       message_id: kind_of(String),
       timestamp: kind_of(String),
       session_tracker_id: kind_of(String),
@@ -20,11 +88,11 @@ describe LiveQA::Message do
       }
     }}
 
-    it { expect(base.to_h).to match(expected_hash) }
+    it { expect(base.extended).to match(expected_hash) }
 
     context 'with store' do
       before do
-       LiveQA::Store.set(:tracker_id, 'hello')
+       LiveQA::Store.set(:session_tracker_id, 'hello')
        LiveQA::Store.set(:request,
         url:        'http://www.test.com/',
         ssl:        true,
@@ -49,13 +117,12 @@ describe LiveQA::Message do
       )
 
       LiveQA::Store.bulk_set(
-        environement:    'production',
+        environment:    'production',
         server_software: 'WEBrick/1.3.1 (Ruby/2.2.7/2017-03-28)'
       )
      end
 
       let(:expected_hash) {{
-        tracker_id: 'hello',
         message_id: kind_of(String),
         timestamp: kind_of(String),
         session_tracker_id: 'hello',
@@ -91,10 +158,10 @@ describe LiveQA::Message do
           process_at: '2017-12-15T03:45:10Z',
           args: ['LiveQA::Event']
         },
-        environement: 'production'
+        environment: 'production'
       }}
 
-      it { expect(base.to_h).to match(expected_hash) }
+      it { expect(base.extended).to match(expected_hash) }
     end
   end
 

data/spec/lib/liveqa/plugins/rack/middleware_spec.rb

@@ -4,7 +4,7 @@ require 'liveqa/plugins/rack/middleware'
 
 describe LiveQA::Plugins::Rack::Middleware do
 
-  let(:app) { RackApp.new }
+  let(:app) { lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['All responses are OK']] } }
   let(:middleware) { LiveQA::Plugins::Rack::Middleware.new(app) }
 
   context 'reset the store' do
@@ -12,14 +12,20 @@ describe LiveQA::Plugins::Rack::Middleware do
       2.times { middleware.call({}) }
     end
 
-    it { expect(app.last_value).to eq(1) }
+    #it { expect(app.last_value).to eq(1) }
     it { expect(LiveQA::Store.store).to eq({}) }
   end
 
   it 'reset the store with error' do
+    allow(middleware).to receive(:call).and_raise(RuntimeError)
     expect { middleware.call(error: true) }.to raise_error(RuntimeError)
 
     expect(LiveQA::Store.store).to eq({})
   end
 
+  it 'includes the secure flag in the cookie for a HTTPS connection' do
+    response =  middleware.call({'HTTP_X_FORWARDED_SSL' => 'on'})
+    expect(response[1]['Set-Cookie']).to match(%r{liveqa_tracker_id.*secure.*})
+  end
+
 end

data/spec/lib/liveqa/plugins/rails/data_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'rails'
+require 'liveqa/plugins/rails/data'
+
+describe LiveQA::Plugins::Rails::Data do
+
+  let(:middleware) { LiveQA::Plugins::Rails::Data }
+
+  describe '#store_data' do
+
+    context 'blank store' do
+      before { middleware.store_data }
+
+      let(:expected) {{
+        environment: kind_of(String)
+      }}
+
+      it { expect(LiveQA::Store.store).to match(expected) }
+    end
+
+  end
+end

data/spec/lib/liveqa/plugins/rails/middleware_data_spec.rb

@@ -19,16 +19,9 @@ describe LiveQA::Plugins::Rails::MiddlewareData do
       before { middleware.store_data(request) }
 
       let(:expected) {{
-        environement: kind_of(String),
         request: {
           id: '42a'
-        },
-        stack: [
-          {
-            name: 'rails',
-            version: kind_of(String)
-          }
-        ]
+        }
       }}
 
       it { expect(LiveQA::Store.store).to match(expected) }
@@ -37,31 +30,17 @@ describe LiveQA::Plugins::Rails::MiddlewareData do
     context 'update the store' do
       before do
         LiveQA::Store.set(:request, { xhr: false })
-        LiveQA::Store.set(:stack, [{ name: 'rack' }])
       end
       before { middleware.store_data(request) }
 
       let(:expected) {{
-        environement: kind_of(String),
         request: {
           id: '42a',
           xhr: false
-        },
-        stack: [
-          {
-            name: 'rack'
-          },
-          {
-            name: 'rails',
-            version: kind_of(String)
-          }
-        ]
+        }
       }}
 
       it { expect(LiveQA::Store.store).to match(expected) }
     end
-
-
   end
-
 end

data/spec/lib/liveqa/plugins/sidekiq/server_middleware_spec.rb

@@ -14,11 +14,7 @@ describe LiveQA::Plugins::Sidekiq::ServerMiddleware do
        'queue' => 'default',
        'jid' => '24cc849f71325b62ef470901',
        'created_at' => 1513299839.2563882,
-       'liveqa_store' =>  {
-          'tracker_id' => '06a09f70-6219-4860-babc-18aa47a62f7f',
-          'user_agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 Safari/537.36',
-          'ip' => '127.0.0.1'
-        },
+       'liveqa_session_tracker_id' => '06a09f70-6219-4860-babc-18aa47a62f7f',
        'enqueued_at' => 1513300328.8271549,
        'error_message' => 'exit',
        'error_class' => 'SystemExit',
@@ -38,22 +34,20 @@ describe LiveQA::Plugins::Sidekiq::ServerMiddleware do
       before { middleware.call('MyWorker', job_attr, 'default') {} }
 
       let(:expected) {{
-        tracker_id: '06a09f70-6219-4860-babc-18aa47a62f7f',
-        user_agent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 Safari/537.36',
-        ip: '127.0.0.1',
+        session_tracker_id: '06a09f70-6219-4860-babc-18aa47a62f7f',
         worker:  {
           name: 'sidekiq',
           version: kind_of(String),
           queue: 'default',
           class: 'MyWorker',
           id: '24cc849f71325b62ef470901',
-          created_at: '2017-12-15T01:03:59Z',
-          process_at: '2017-12-15T01:12:08Z',
+          created_at: '2017-12-15T01:03:59.256Z',
+          process_at: '2017-12-15T01:12:08.827Z',
           args: ['42'],
           retried: true,
           retry_number: 1,
-          failed_at: '2017-12-15T01:09:26Z'
-        }
+          failed_at: '2017-12-15T01:09:26.646Z'
+        },
       }}
 
       it { expect(LiveQA::Store.store).to match(expected) }

data/spec/lib/liveqa/util_spec.rb

@@ -2,6 +2,15 @@ require 'spec_helper'
 
 describe LiveQA::Util do
 
+  describe '#camelize' do
+    it { expect(LiveQA::Util.except_keys({ a: 1, b: 2 }, :b)).to eq({ a: 1 }) }
+  end
+
+  describe '#camelize' do
+    it { expect(LiveQA::Util.camelize('model')).to eq("Model") }
+    it { expect(LiveQA::Util.camelize('my_model')).to eq("MyModel") }
+  end
+
   describe '#compact' do
     it { expect(LiveQA::Util.compact(test: nil, other: 'test')).to eq(other: 'test') }
   end
@@ -120,4 +129,35 @@ describe LiveQA::Util do
     it { expect(LiveQA::Util.deep_obfuscate_value(payload, fields)).to eq(expected) }
   end
 
+  describe '.properties' do
+    before { LiveQA.configurations.custom_object_properties = { user: %w[id email name] }}
+
+    let(:group) { double('Group', id: 10, name: "John Doe", state: 'active', class: double('Class', name: 'Group')) }
+    let(:user) { double('User', id: 42, name: "John Doe", email: "admin@email.com", state: 'active', class: double('Class', name: 'User')) }
+    let(:error_message) {{ email: ["can't be blank", "Looks like you've entered an invalid email address"] }}
+
+    let(:expected) {{
+      'group' => {
+        'id' => group.id,
+        'name' => group.name
+      },
+      'user' => {
+        'id' => user.id,
+        'email' => user.email,
+        'name' => user.name
+      },
+      invited_by: {
+        'id' => user.id,
+        'email' => user.email,
+        'name' => user.name
+      },
+      errors: error_message,
+      other: 81.to_f,
+      another: 42,
+      'float' => 81.to_f
+    }}
+
+    it { expect(LiveQA::Util.properties(group, user, 81.to_f, invited_by: user, errors: error_message, other: 81.to_f, another: 42)).to match(expected) }
+  end
+
 end

data/spec/lib/liveqa/watcher_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe LiveQA::Identity do
+
+  describe '#create' do
+    let(:response) { double('LiveQA::Request', body: "{\"object\":\"watcher\",\"id\":1}") }
+    before { expect(LiveQA::Request).to receive(:execute).and_return(response) }
+
+    subject(:create) { LiveQA::Watcher.create(template_flow: 'My Flow', expected_times: 42) }
+
+    it { is_expected.to be_successful }
+    it { expect(create.id).to eq(1) }
+  end
+
+  describe '#delete' do
+    let(:response) { double('LiveQA::Request', body: "{\"object\":\"watcher\",\"id\":1}") }
+    before { expect(LiveQA::Request).to receive(:execute).and_return(response) }
+
+    subject(:delete) { LiveQA::Watcher.delete(1) }
+
+    it { is_expected.to be_successful }
+    it { expect(delete.id).to eq(1) }
+  end
+
+end

data/spec/lib/liveqa_spec.rb

@@ -16,7 +16,6 @@ describe LiveQA::Event do
       name:    'test',
       message_id: kind_of(String),
       timestamp: kind_of(String),
-      tracker_id: kind_of(String),
       session_tracker_id: kind_of(String),
       properties: {
         total: 10
@@ -29,10 +28,10 @@ describe LiveQA::Event do
       server: {
         host: kind_of(String),
         pid: kind_of(Numeric)
-      }
+      },
     }}
 
-    it { expect(LiveQA::Event).to receive(:create).with(expected_arg, { no_ssl: true }).and_return(response) }
+    it { expect(LiveQA::Event).to receive(:create).with(hash_including(expected_arg), { no_ssl: true }).and_return(response) }
 
     context 'not enabled' do
       before { LiveQA.configurations.enabled = false }
@@ -63,10 +62,10 @@ describe LiveQA::Event do
       server: {
         host: kind_of(String),
         pid: kind_of(Numeric)
-      }
+      },
     }}
 
-    it { expect(LiveQA::Event).to receive(:create).with(expected_arg, { no_ssl: true }).and_return(response) }
+    it { expect(LiveQA::Event).to receive(:create).with(hash_including(expected_arg), { no_ssl: true }).and_return(response) }
 
     context 'not enabled' do
       before { LiveQA.configurations.enabled = false }
@@ -75,4 +74,88 @@ describe LiveQA::Event do
     end
   end
 
+  describe '.set_group' do
+    let(:response) { double('LiveQA::Group', successful?: true) }
+    after { LiveQA.set_group(42, { properties: { name: 'John Group' }}, { no_ssl: true }) }
+
+    let(:expected_arg) {{
+      properties: {
+        name: 'John Group'
+      },
+      message_id: kind_of(String),
+      timestamp: kind_of(String),
+      session_tracker_id: kind_of(String),
+    }}
+
+    it { expect(LiveQA::Group).to receive(:update).with(42, expected_arg, { no_ssl: true }).and_return(response) }
+
+    context 'not enabled' do
+      before { LiveQA.configurations.enabled = false }
+
+      it { expect(LiveQA::Group).to_not receive(:update) }
+    end
+  end
+
+  describe '.set_identity' do
+    let(:response) { double('LiveQA::Identity', successful?: true) }
+    after { LiveQA.set_identity(42, { properties: { name: 'John Doe' }}, { no_ssl: true }) }
+
+    let(:expected_arg) {{
+      properties: {
+        name: 'John Doe'
+      },
+      message_id: kind_of(String),
+      timestamp: kind_of(String),
+      session_tracker_id: kind_of(String),
+    }}
+
+    it { expect(LiveQA::Identity).to receive(:update).with(42, expected_arg, { no_ssl: true }).and_return(response) }
+
+    context 'not enabled' do
+      before { LiveQA.configurations.enabled = false }
+
+      it { expect(LiveQA::Identity).to_not receive(:update) }
+    end
+  end
+
+  describe '.watch' do
+    let(:response) { double('LiveQA::Identity', successful?: true) }
+
+
+    context 'with session' do
+      after { LiveQA.watch('My Flow', { expected_times: 42 }, { no_ssl: true }) }
+
+      let(:expected_arg) {{
+        template_flow: 'My Flow',
+        expected_times: 42,
+        message_id: kind_of(String),
+        timestamp: kind_of(String),
+        session_tracker_id: kind_of(String),
+      }}
+
+      it { expect(LiveQA::Watcher).to receive(:create).with(expected_arg, { no_ssl: true }).and_return(response) }
+    end
+
+    context 'with session' do
+      after { LiveQA.watch('My Flow', { expected_times: 42, without_session: true }, { no_ssl: true }) }
+
+      let(:expected_arg) {{
+        template_flow: 'My Flow',
+        expected_times: 42,
+        message_id: kind_of(String),
+        timestamp: kind_of(String),
+      }}
+
+      it { expect(LiveQA::Watcher).to receive(:create).with(expected_arg, { no_ssl: true }).and_return(response) }
+    end
+
+    context 'not enabled' do
+      after { LiveQA.watch('My Flow', { expected_times: 42 }, { no_ssl: true }) }
+
+      before { LiveQA.configurations.enabled = false }
+
+      it { expect(LiveQA::Watcher).to_not receive(:create) }
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -15,7 +15,9 @@ RSpec.configure do |config|
   config.before(:each) do
     LiveQA.configure do |config|
       config.api_host  = 'localhost:4003'
-      config.api_key   = 'MVulkyYgAf1Xqc09eLbvONymxZCSwA-yevXRsBHx226lxdwIs5ppG942'
+      config.account_token = 'acc_xx'
+      config.space_name = 'LiveQA'
+      config.environment_name = 'test'
       config.http_secure = false
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liveqa
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.8.3
 platform: ruby
 authors:
 - LiveQA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faker
@@ -97,6 +97,7 @@ files:
 - README.md
 - Rakefile
 - lib/liveqa.rb
+- lib/liveqa/api_operation/delete.rb
 - lib/liveqa/api_operation/save.rb
 - lib/liveqa/api_resource.rb
 - lib/liveqa/async_handlers/base.rb
@@ -104,11 +105,14 @@ files:
 - lib/liveqa/config.rb
 - lib/liveqa/errors.rb
 - lib/liveqa/event.rb
+- lib/liveqa/group.rb
+- lib/liveqa/identity.rb
 - lib/liveqa/library_name.rb
 - lib/liveqa/liveqa_object.rb
 - lib/liveqa/message.rb
 - lib/liveqa/plugins.rb
 - lib/liveqa/plugins/rack/middleware.rb
+- lib/liveqa/plugins/rails/data.rb
 - lib/liveqa/plugins/rails/middleware_data.rb
 - lib/liveqa/plugins/rails/railtie.rb
 - lib/liveqa/plugins/sidekiq/client_middleware.rb
@@ -118,19 +122,25 @@ files:
 - lib/liveqa/store.rb
 - lib/liveqa/util.rb
 - lib/liveqa/version.rb
+- lib/liveqa/watcher.rb
 - liveqa.gemspec
+- spec/lib/liveqa/api_resource_spec.rb
 - spec/lib/liveqa/async_handlers/base_spec.rb
 - spec/lib/liveqa/async_handlers/sidekiq_spec.rb
 - spec/lib/liveqa/config_spec.rb
 - spec/lib/liveqa/event_spec.rb
+- spec/lib/liveqa/group_spec.rb
+- spec/lib/liveqa/identity_spec.rb
 - spec/lib/liveqa/liveqa_object_spec.rb
 - spec/lib/liveqa/message_spec.rb
 - spec/lib/liveqa/plugins/rack/middleware_spec.rb
+- spec/lib/liveqa/plugins/rails/data_spec.rb
 - spec/lib/liveqa/plugins/rails/middleware_data_spec.rb
 - spec/lib/liveqa/plugins/sidekiq/client_middleware_spec.rb
 - spec/lib/liveqa/plugins/sidekiq/server_middleware_spec.rb
 - spec/lib/liveqa/store_spec.rb
 - spec/lib/liveqa/util_spec.rb
+- spec/lib/liveqa/watcher_spec.rb
 - spec/lib/liveqa_spec.rb
 - spec/spec_helper.rb
 - spec/support/rack_app.rb
@@ -159,18 +169,23 @@ signing_key:
 specification_version: 4
 summary: LiveQA ruby integration
 test_files:
+- spec/lib/liveqa/api_resource_spec.rb
 - spec/lib/liveqa/async_handlers/base_spec.rb
 - spec/lib/liveqa/async_handlers/sidekiq_spec.rb
 - spec/lib/liveqa/config_spec.rb
 - spec/lib/liveqa/event_spec.rb
+- spec/lib/liveqa/group_spec.rb
+- spec/lib/liveqa/identity_spec.rb
 - spec/lib/liveqa/liveqa_object_spec.rb
 - spec/lib/liveqa/message_spec.rb
 - spec/lib/liveqa/plugins/rack/middleware_spec.rb
+- spec/lib/liveqa/plugins/rails/data_spec.rb
 - spec/lib/liveqa/plugins/rails/middleware_data_spec.rb
 - spec/lib/liveqa/plugins/sidekiq/client_middleware_spec.rb
 - spec/lib/liveqa/plugins/sidekiq/server_middleware_spec.rb
 - spec/lib/liveqa/store_spec.rb
 - spec/lib/liveqa/util_spec.rb
+- spec/lib/liveqa/watcher_spec.rb
 - spec/lib/liveqa_spec.rb
 - spec/spec_helper.rb
 - spec/support/rack_app.rb