tests and new travis keys

.travis.yml

@@ -1,9 +1,10 @@
 before-install:
 - export TRAVIS_COMMIT_MSG="$(git log --format=%B --no-merges -n 1)"
+env:
 env:
   global:
-  - secure: pdkgtWkvLHw9GCLdyOzd2Rl5RVQA5YgcA6gBYscEscrztiEslC6ZvljQszS8Imi3hQtgsvczoJSpAt24L2PAP137VG9n/RYHTj3L5wu3JLqYJOqtxkFDHCSxB7g8m0ESMHc2zXJ2ymbwR2lMValLmPkwn41Dkmcwom5Y2L3OR/nQvi2WSDkN8IMqQH8uRUZIgDjAAVyA+sR0UZyYwQFgvb3fPS4G+1QXiIu1sQ6oOa6c8HAwUlV8umrI4+t5vSJBwNk/Sl0RxTc3f0z36GvFNBxvpGsJXCNdteio633yMvaQnCc6BJpmqvVqveOXEZ8l3myRN0mIs20FM92Sx3Mg4QlvogbKw6fDLFM0+cYeuBwX31YQ7vCw3mazH/v1RUCkfit1Am66Hv+OuJpBgLVR9bPMfKRZlbgnCOBX+YZKTjM4UWl7lF4gSO9ySzC16nbNixgtC0RGt3MHb7JhlOormOqnvbQV7t45Ktm6d+GyREOeXCSi4ncgXF/lwBN+0wubQZEVQlNNzL3Ed1gYSwGvBgYxIadYYgTmHXYhhndRqPIfRw5J5CRNTwlGGat1yC0R6HV1xQMhXjlfo2knTKrHS103myUnjLpGIJS/bJxcNms+CmAXUtS17xDHGe8r6lCrcevFraDwAXWsoffYPEa8yWcKKoT/G/izwtPkAoeqRoI=
-  - secure: JU9gQ+l5Afbou973viwx/jDoCG7HDjwij9N8lZeKeVBptoBPfnWJ6FL6RVtbcAco70g8RsEKHyeHtuS6o83NwZ8yGKMvKn8weErWE5Ftj72VrnGen1ZUEzj38/vLf9N/VWUZMCaynJNF2iKwXqewTLLPW660b6N8EtZTy/IGP7pFgryhe3r0dQMTei27c81542iC/FBVMX5HCrJfVCUH9bFSKcd7aWQbQNBQXi/TUTJ74eM64Pi+IFX012n5jYdewCYXf0LvPyYYL3RrJNI0+/aq4eBeZkVEMnFMNK3FqKKWIiDV4/OhRca4MrQS0ekboIjfI763eJooE7QnGKfHMT8Tenuf1WbjEFaUILs6r5O0gFuVcrZRaYPQdFJI2GmwbFrlSXhjyihgFF2yc7EUxdqKPvy4Ct2Qt40qlKciQRjnlLQwTxU48bC4XqfNzLuJkLSqK55aLWwTn6hsGzm6JEoYGDI6/ysqoGhXDgtKGjRB22pH4ZqyqPo5h8hhZm/iIn44iTgGFlhbHKTBUhdJbrilckuxoakhY5VNNSMJKprs90T98WGwWUOpMsMDa6Eugy9LiElEtfw7n3LWE2oGHRTJvwIZAlk7CFo8uznaGTemaW0KCs5TQo0cTK/RiT3GLrQnDhCP6EcYU9fMojCK9iY09cWBXF9ovTGrhQBvj2I=
+    - secure: RFlzPnMD/XcijrlAHePMzj4cCgIoCnZldFZFWGlg1dOKuZenGCF7CIhPK46DI2MYZQWxLCDtlUhz90L8EH2IPyp01jvCiZrVoofnl3u4B4B9X6/QpAKjnvvBG5/HN/i5zrgzKGizU7kP22GdXJZWWUWNuVO/fnfmHaeX3z3WRcN+CQrnIXiq0WVY47ecVfelUuSzsMqw/ld38I/Pj3rH9qHLlguF/iGqk/WPigtO7cj8ze17C3Q1Sl5TXEfUf8IIUWixnUh7oii1l0QVLlowpYc9M1Pvcb9jlLpi82u9SAmdJyXyUHAgf1QJYrfngoMJMWfyzBlZmkeOjLhLpDBgkRi5F2+SNAnK/KZwP8wjqc5mj/EJqFGpd1CmD3fCuC4hWJ3c/CSTSNF6kibERwVi/dX64FIytAx7r5NdLTuuinlevDIxkZIxkgNG6SmkpJ9uUqH9XLkpWt73purE/KeknRbVg7zgYff+vqlNrKJe8Ezguxs3iAfzZkn5U4lYu71kf3KRSCeO34hA61vbNyTqgxiMb6TeVur5T7YqHeMd/iA8LTEj8rEP9JsozeU9UEcN9c0GPQDKQNyYyWK5qC9XoVTjR9UAWod/C3m7jGB2lYnJuqhrZG86Zjp4oGg1NyuFzRQusAlCFUxq6d8oKX40tF7iXkNyhUXR7XzDTEdJYNU=
+    - secure: HE3sxV20j619Bcru8LIf40F8WLtMMZ/BBVxsPFQEovj/z1GWxFa/aTrcrEpdDjnlAPMZHXe0Z1pAPXII6JtgUjYX1UsW+IUSdUVR41UTDgOMFCqILynUGsPbwGzGgijGD/vcKItdqZ2NO48VOa2iv6Vaq29LXLxJGbHm+E+kZ7pHYSCUrEQ9TUtD2SuWvbeW/fgLFE6sXNNahmEE8bJqSZEzEgqIT9ozLI9tP23o49V/RWg/pt4ChuqH7Qt3XiUGeYOOXbc3SxaVbPkVTg00asJB6NVADmJRjijf0saU4E0Ws7nFkfWGEnQ1BM8aSgnr/H/X7jPwJD8WBx2s0IQZUQDVpctrqDuiGFEMsjYUZxfeUPSXM8+EdB/tHQ2PFlRWTgK18jkhQkyJHsebfqVXAPmaNNRzI1boJ4yxj4C8UNayDyZSOifmje4x+LiegI7e5solzXYIHL7gK8w+wRu35sG6d6Osns37h04rfeWUcW7uGxTSxbAfkOlIkxBfqZhvSlp54EDyoIRxgrkqtxbHl7QvMJOhx1JVbUHFkWDTCOar8PTv6Q0awI5las5pqaaR1FWcySAEFVGwdyYwnMOxW02VOaTRfUAuAPPnm5mFumZMrXkN24piFYX7R08uWDkJ2z9Hdi4OFrhO30DhSZbUBGSSCX+aeiS5c9jDhz6AP9Y=
 addons:
   sauce_connect: true
 cache:

src/index.coffee

@@ -182,7 +182,7 @@ if window?
       setTimeout ()->
         flush()
         next()
-      Espy.flushRate || 200
+      , Espy.flushRate || 200
 
     # prevent blocking page load
     setTimeout ()->

test/ci-config.coffee

@@ -35,10 +35,10 @@ module.exports = [
   # # deviceName: 'Android Emulator'
   # deviceOrientation: 'portrait'
 # ,
-  # browserName: 'safari'
-  # platform: 'OS X 10.10'
-  # version: '8.0'
-# ,
+  browserName: 'safari'
+  platform: 'OS X 10.10'
+  version: '8.0'
+,
   # browserName: 'internet explorer'
   # platform: 'Windows 8.1'
   # version: '11.0'

test/test.coffee

@@ -4,7 +4,7 @@ should = require('chai').should()
 {getBrowser} = require './util'
 
 describe "Espy (#{process.env.BROWSER})", ->
-  @timeout 90000
+  @timeout 120000
   browser  = getBrowser()
   testPage = "http://localhost:#{process.env.PORT ? 3333}/test.html"
 
@@ -52,4 +52,18 @@ describe "Espy (#{process.env.BROWSER})", ->
 
         .call done
 
+    it 'should capture generic events', (done)->
+      browser
+        .url testPage
+        .waitForExist '#flush'
+        .click '#1'
+        .getText '#flush', (err, res) ->
+          record = JSON.parse(res)
+
+          queue = record.queue
+          queue.length.should.equal 1
+          event = queue[0]
+          event.event.should.equal 'click_1'
+        .call done
+
     #it 'should capture page leave', (done) ->

test/test.html

@@ -12,13 +12,24 @@
     <script src="espy.js"></script>
   </head>
   <body>
-    <div id="flush"></div>
+    <button id="1">1</button>
+    <button id="2">2</button>
+    <button id="3">3</button>
     <script>
-      Espy.url = "http://localhost:8080/analytics/?token=eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJiaXQiOjIwLCJqdGkiOiJiZ1hRYkpyWGtDQSIsInN1YiI6IkdQVHE2ZTM2c1IifQ.7SllMXMCydU5kTivZlMDBHfkUQm5l742l7Y0x7Pci03x7iHKL_ggrEeiGDkfYUoThv7p1vXjqVE1ps3JY0exjw"
-      Espy.flushRate = 10000
+      Espy.url = 'http://localhost:8080/analytics/?token=eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJiaXQiOjIwLCJqdGkiOiJscTBELW1iVTdMdyIsInN1YiI6IkdQVHE2ZTM2c1IifQ.4nefUphoTfhc9095G1lYkorSV25rQVhTm_etLkHmoPOmqK3t6mb0-hFayw_1bKSTKwfSmhgFq_0w0g848U9kYg'
+      Espy.flushRate = 1
       Espy.onflush = function(record) {
-        document.getElementById('flush').innerHTML = JSON.stringify(record)
+        var flush = document.getElementById('flush')
+        if (!flush) {
+          flush = document.createElement('div')
+          flush.id = 'flush'
+          document.body.appendChild(flush)
+        }
+        flush.innerHTML = JSON.stringify(record)
       }
+      $('button').on('click', function(event){
+        Espy('click' + '_' + $(this).attr('id'))
+      })
     </script>
   </body>
 </html>