charted 0.0.8 → 0.1.0

data/test/model_test.rb

@@ -0,0 +1,101 @@
+require_relative 'helper'
+
+class ModelTest < ChartedTest
+  def test_create
+    site = Charted::Site.create(domain: 'localhost')
+    visitor = Charted::Visitor.create(
+      site: site,
+      bucket: 0,
+      ip_address: '67.188.42.140',
+      user_agent:
+        'Mozilla/5.0 (X11; Linux i686; rv:14.0) Gecko/20100101 Firefox/14.0.1')
+    visit = Charted::Visit.create(
+      visitor: visitor,
+      path: '/',
+      title: 'Prime',
+      referrer: 'http://www.google.com?q=Charted+Test')
+
+    assert_equal(site, visit.site)
+    assert_equal([visit], visitor.visits)
+    assert_equal('Charted Test', visit.search_terms)
+    assert_match(/^\w{6}$/, visitor.secret)
+    assert_equal("#{visitor.id}-#{visitor.bucket}-#{visitor.secret}", visitor.cookie)
+    assert_equal('Linux', visitor.platform)
+    assert_equal('Firefox', visitor.browser)
+    assert_equal('14.0.1', visitor.browser_version)
+
+    assert_equal(visitor, site.visitor_with_cookie(visitor.cookie))
+    assert_nil(site.visitor_with_cookie("#{visitor.id}-zzzzz"))
+    assert_nil(site.visitor_with_cookie("0-zzzzz"))
+    assert_nil(site.visitor_with_cookie(nil))
+
+    event = visitor.make_events('User Clicked').first
+    assert_equal(site, event.site)
+    assert_equal(visitor, event.visitor)
+    assert_equal('User Clicked', event.label)
+
+    conversion = visitor.start_conversions('User Purchased;User Abandon').first
+    visitor.start_conversions('User Purchased') # no effect
+    assert_equal(2, visitor.conversions.length)
+    assert_equal(site, conversion.site)
+    assert_equal(visitor, conversion.visitor)
+    assert_equal('User Purchased', conversion.label)
+    refute(conversion.ended?)
+    visitor.end_goals('User Purchased')
+    conversion.refresh
+    assert(conversion.ended?)
+    visitor.end_goals('Nonexistant') # no effect
+    assert_equal(2, visitor.conversions.length)
+
+    experiment = visitor.start_experiments('User Next:A').first
+    visitor.start_experiments('User Next:A') # no effect
+    visitor.start_experiments('User Next:B') # changes bucket
+    experiment.refresh
+    assert_equal(1, visitor.experiments.length)
+    assert_equal(site, experiment.site)
+    assert_equal(visitor, experiment.visitor)
+    assert_equal('User Next', experiment.label)
+    assert_equal('B', experiment.bucket)
+    refute(experiment.ended?)
+    visitor.end_goals('User Next')
+    experiment.refresh
+    assert(experiment.ended?)
+    visitor.end_goals('Nonexistant') # no effect
+    assert_equal(1, visitor.experiments.length)
+  end
+
+  def test_user_agents
+    visitor = Charted::Visitor.new
+
+    visitor.user_agent = 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)'
+    assert_equal('Internet Explorer', visitor.browser)
+    assert_equal('7.0', visitor.browser_version)
+    assert_equal('Windows', visitor.platform)
+
+    visitor.user_agent = 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/125.2 (KHTML, like Gecko) Safari/125.8'
+    assert_equal('Safari', visitor.browser)
+    assert_equal('1.2.2', visitor.browser_version)
+    assert_equal('Macintosh', visitor.platform)
+
+    visitor.user_agent = 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.19) Gecko/20081216 Ubuntu/8.04 (hardy) Firefox/2.0.0.19'
+    assert_equal('Firefox', visitor.browser)
+    assert_equal('2.0.0.19', visitor.browser_version)
+    assert_equal('Linux', visitor.platform)
+  end
+
+  def test_blanks
+    site = Charted::Site.create(:domain => 'localhost')
+    visitor = Charted::Visitor.create(
+      :site => site,
+      :user_agent => '',
+      :ip_address => '')
+    visit = Charted::Visit.create(
+      :visitor => visitor,
+      :path => '/',
+      :title => 'Prime',
+      :referrer => '')
+    assert(site.id)
+    assert(visitor.id)
+    assert(visit.id)
+  end
+end

metadata

@@ -1,144 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: charted
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Hugh Bien
 autorequire: 
-bindir: .
+bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: data_mapper
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.12'
 - !ruby/object:Gem::Dependency
   name: geoip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: pony
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: useragent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: search_terms
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: dashes
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.4'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: A Sinatra app for tracking web traffic on multiple sites.
 email:
 - hugh@hughbien.com
@@ -149,35 +160,45 @@ extra_rdoc_files: []
 files:
 - LICENSE.md
 - README.md
+- bin/charted
 - config.ru
 - geoip.dat
-- charted
 - lib/charted.rb
-- test/charted_test.rb
+- lib/charted/app.rb
+- lib/charted/command.rb
+- lib/charted/config.rb
+- lib/charted/model.rb
+- lib/charted/version.rb
+- migrate/001_init_schema.rb
+- public/charted/script.js
+- test/app_test.rb
+- test/command_test.rb
+- test/config_test.rb
 - test/fixtures.rb
-- ./charted
+- test/helper.rb
+- test/model_test.rb
 homepage: https://github.com/hughbien/charted
-licenses: []
+licenses:
+- BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Minimal web traffic analytics
 test_files: []

data/test/charted_test.rb

@@ -1,389 +0,0 @@
-ENV['RACK_ENV'] = 'test'
-
-require File.expand_path('../lib/charted', File.dirname(__FILE__))
-require 'dm-migrations'
-require 'minitest/autorun'
-require 'rack'
-require 'rack/test'
-require 'rack/server'
-require 'fileutils'
-
-DataMapper.setup(:default, 'sqlite::memory:')
-DataMapper.auto_migrate!
-
-module Pony
-  def self.mail(fields)
-    @last_mail = fields
-  end
-
-  def self.last_mail
-    @last_mail
-  end
-end
-
-class ChartedTest < MiniTest::Unit::TestCase
-  def setup
-    Charted.configure(false) do |c|
-      c.email       'dev@localhost'
-      c.db_adapter  'sqlite3'
-      c.db_host     'localhost'
-      c.db_username 'root'
-      c.db_password 'secret'
-      c.db_database 'test.sqlite3'
-      c.sites       ['localhost']
-    end
-    Pony.mail(nil)
-  end
-
-  def teardown
-    FileUtils.rm_rf(File.expand_path('../temp', File.dirname(__FILE__)))
-  end
-end
-
-class ConfigTest < ChartedTest
-  def test_db
-    assert_equal('dev@localhost', Charted.config.email)
-    assert_equal('sqlite3', Charted.config.db_adapter)
-    assert_equal('localhost', Charted.config.db_host)
-    assert_equal('root', Charted.config.db_username)
-    assert_equal('secret', Charted.config.db_password)
-    assert_equal('test.sqlite3', Charted.config.db_database)
-    assert_equal(['localhost'], Charted.config.sites)
-  end
-end
-
-class ModelTest < ChartedTest
-  def setup
-    Charted::Site.destroy
-    Charted::Visitor.destroy
-    Charted::Visit.destroy
-    Charted::Event.destroy
-    Charted::Conversion.destroy
-    Charted::Experiment.destroy
-  end
-
-  def test_create
-    site = Charted::Site.create(domain: 'localhost')
-    visitor = Charted::Visitor.create(
-      site: site,
-      bucket: 0,
-      ip_address: '67.188.42.140',
-      user_agent:
-        'Mozilla/5.0 (X11; Linux i686; rv:14.0) Gecko/20100101 Firefox/14.0.1')
-    visit = Charted::Visit.create(
-      visitor: visitor,
-      path: '/',
-      title: 'Prime',
-      referrer: 'http://www.google.com?q=Charted+Test')
-
-    assert_equal(site, visit.site)
-    assert_equal([visit], site.visits)
-    assert_equal('Charted Test', visit.search_terms)
-    assert_match(/^\w{5}$/, visitor.secret)
-    assert_equal("#{visitor.id}-#{visitor.bucket}-#{visitor.secret}", visitor.cookie)
-    assert_equal('Linux', visitor.platform)
-    assert_equal('Firefox', visitor.browser)
-    assert_equal('14.0.1', visitor.browser_version)
-
-    assert_equal(visitor, site.visitor_with_cookie(visitor.cookie))
-    assert_nil(site.visitor_with_cookie("#{visitor.id}-zzzzz"))
-    assert_nil(site.visitor_with_cookie("0-zzzzz"))
-    assert_nil(site.visitor_with_cookie(nil))
-
-    event = visitor.make_events('User Clicked').first
-    assert_equal(site, event.site)
-    assert_equal(visitor, event.visitor)
-    assert_equal('User Clicked', event.label)
-
-    conversion = visitor.start_conversions('User Purchased;User Abandon').first
-    visitor.start_conversions('User Purchased') # no effect
-    assert_equal(2, visitor.conversions.length)
-    assert_equal(site, conversion.site)
-    assert_equal(visitor, conversion.visitor)
-    assert_equal('User Purchased', conversion.label)
-    refute(conversion.ended?)
-    visitor.end_goals('User Purchased')
-    assert(conversion.ended?)
-    visitor.end_goals('Nonexistant') # no effect
-    assert_equal(2, visitor.conversions.length)
-
-    experiment = visitor.start_experiments('User Next:A').first
-    visitor.start_experiments('User Next:A') # no effect
-    visitor.start_experiments('User Next:B') # changes bucket
-    assert_equal(1, visitor.experiments.length)
-    assert_equal(site, experiment.site)
-    assert_equal(visitor, experiment.visitor)
-    assert_equal('User Next', experiment.label)
-    assert_equal('B', experiment.bucket)
-    refute(experiment.ended?)
-    visitor.end_goals('User Next')
-    assert(experiment.ended?)
-    visitor.end_goals('Nonexistant') # no effect
-    assert_equal(1, visitor.experiments.length)
-  end
-
-  def test_unique_identifier
-    assert_match(/^\w{5}$/, Charted::Visitor.generate_secret)
-  end
-
-  def test_user_agents
-    visitor = Charted::Visitor.new
-
-    visitor.user_agent = 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)'
-    assert_equal('Internet Explorer', visitor.browser)
-    assert_equal('7.0', visitor.browser_version)
-    assert_equal('Windows', visitor.platform)
-
-    visitor.user_agent = 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/125.2 (KHTML, like Gecko) Safari/125.8'
-    assert_equal('Safari', visitor.browser)
-    assert_equal('1.2.2', visitor.browser_version)
-    assert_equal('Macintosh', visitor.platform)
-
-    visitor.user_agent = 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.19) Gecko/20081216 Ubuntu/8.04 (hardy) Firefox/2.0.0.19'
-    assert_equal('Firefox', visitor.browser)
-    assert_equal('2.0.0.19', visitor.browser_version)
-    assert_equal('Linux', visitor.platform)
-  end
-
-  def test_blanks
-    site = Charted::Site.create(:domain => 'localhost')
-    visitor = Charted::Visitor.create(
-      :site => site,
-      :user_agent => '',
-      :ip_address => '')
-    visit = Charted::Visit.create(
-      :visitor => visitor,
-      :path => '/',
-      :title => 'Prime',
-      :referrer => '')
-    assert(site.id)
-    assert(visitor.id)
-    assert(visit.id)
-  end
-end
-
-class AppTest < ChartedTest
-  include Rack::Test::Methods
-
-  def setup
-    Charted::Site.destroy
-    Charted::Visitor.destroy
-    Charted::Visit.destroy
-    Charted::Event.destroy
-    Charted::Conversion.destroy
-    Charted::Experiment.destroy
-    clear_cookies
-
-    @site = Charted::Site.create(:domain => 'example.org')
-    @params = {
-      :bucket => 1,
-      :path => '/',
-      :title => 'Prime',
-      :referrer => 'http://localhost/?k=v',
-      :resolution => '1280x800'
-    }
-    @env = {
-      'HTTP_USER_AGENT' =>
-        'Mozilla/5.0 (X11; Linux i686; rv:14.0) Gecko/20100101 Firefox/14.0.1',
-      'REMOTE_ADDR' => '67.188.42.140'
-    }
-  end
-
-  def test_environment
-    assert_equal(:test, Charted::App.environment)
-  end
-
-  def test_bad_domain
-    get '/charted', @params, 'HTTP_HOST' => 'localhost'
-    assert_equal(404, last_response.status)
-    assert_equal(0, Charted::Visitor.count)
-    assert_equal(0, Charted::Visit.count)
-  end
-
-  def test_new_visitor
-    get '/charted', @params, @env
-    assert(last_response.ok?)
-    assert_equal(1, Charted::Visitor.count)
-    assert_equal(1, Charted::Visit.count)
-
-    visitor = Charted::Visitor.first
-    visit = Charted::Visit.first
-    assert_equal(@site, visitor.site)
-    assert_equal(@site, visit.site)
-    assert_equal('Prime', visit.title)
-    assert_equal('/', visit.path)
-    assert_equal('http://localhost/?k=v', visit.referrer)
-    assert_equal('1280x800', visitor.resolution)
-    assert_equal('United States', visitor.country)
-    assert_equal(visitor.cookie, rack_mock_session.cookie_jar['charted'])
-  end
-
-  def test_old_visitor
-    visitor = Charted::Visitor.create(:site => @site)
-    visit = Charted::Visit.create(
-      :visitor => visitor, :path => '/', :title => 'Prime')
-    set_cookie("charted=#{visitor.cookie}")
-
-    get '/charted', @params, @env
-    assert(last_response.ok?)
-    assert_equal(1, Charted::Visitor.count)
-    assert_equal(2, Charted::Visit.count)
-    assert_equal(visitor.cookie, rack_mock_session.cookie_jar['charted'])
-  end
-
-  def test_visitor_bad_cookie
-    visitor = Charted::Visitor.create(:site => @site)
-    visit = Charted::Visit.create(
-      :visitor => visitor, :path => '/', :title => 'Prime')
-    set_cookie("charted=#{visitor.id}-zzzzz")
-
-    get '/charted', @params, @env
-    assert(last_response.ok?)
-    assert_equal(2, Charted::Visitor.count)
-    assert_equal(2, Charted::Visit.count)
-    refute_equal(visitor.cookie, rack_mock_session.cookie_jar['charted'])
-  end
-
-  def test_events # TODO: use correct HTTP methods?
-    get '/charted/record', events: 'Event Label;Event Label 2'
-    assert_equal(404, last_response.status)
-
-    visitor = @site.visitors.create
-    set_cookie("charted=#{visitor.cookie}")
-    get '/charted/record', events: 'Event Label;Event Label 2'
-    assert(last_response.ok?)
-    assert_equal(2, Charted::Event.count)
-
-    event = Charted::Event.first(label: 'Event Label')
-    assert_equal(@site, event.site)
-    assert_equal(visitor, event.visitor)
-    assert_equal('Event Label', event.label)
-
-    event2 = Charted::Event.first(label: 'Event Label 2')
-    assert(event2)
-    assert_equal('Event Label 2', event2.label)
-  end
-
-  def test_conversions
-    visitor = @site.visitors.create
-    set_cookie("charted=#{visitor.cookie}")
-    get '/charted', @params.merge(conversions: 'Logo Clicked;Button Clicked'), @env
-    assert(last_response.ok?)
-    assert_equal(2, Charted::Conversion.count)
-
-    logo = visitor.conversions.first(label: 'Logo Clicked')
-    button = visitor.conversions.first(label: 'Button Clicked')
-    refute(logo.ended?)
-    refute(button.ended?)
-
-    get '/charted/record', goals: 'Logo Clicked;Button Clicked'
-    assert(last_response.ok?)
-    logo.reload
-    button.reload
-    assert(logo.ended?)
-    assert(button.ended?)
-  end
-
-  def test_experiments
-    visitor = @site.visitors.create
-    set_cookie("charted=#{visitor.cookie}")
-    get '/charted', @params.merge(experiments: 'Logo:A;Button:B'), @env
-    assert(last_response.ok?)
-    assert_equal(2, Charted::Experiment.count)
-
-    logo = visitor.experiments.first(label: 'Logo')
-    button = visitor.experiments.first(label: 'Button')
-    assert_equal('Logo', logo.label)
-    assert_equal('A', logo.bucket)
-    refute(logo.ended?)
-    assert_equal('Button', button.label)
-    assert_equal('B', button.bucket)
-    refute(button.ended?)
-
-    get '/charted/record', goals: 'Logo;Button'
-    assert(last_response.ok?)
-    logo.reload
-    button.reload
-    assert(logo.ended?)
-    assert(button.ended?)
-  end
-
-  private
-  def app
-    @app ||= Rack::Server.new.app
-  end
-end
-
-class CommandTest < ChartedTest
-  def setup
-    @cmd = Charted::Command.new
-    @cmd.config_loaded = true
-    Charted::Site.destroy
-    Charted::Visitor.destroy
-    Charted::Visit.destroy
-    Charted::Event.destroy
-    Charted::Conversion.destroy
-    Charted::Experiment.destroy
-    Charted::Site.create(:domain => 'localhost')
-    Charted::Site.create(:domain => 'example.org')
-  end
-
-  def test_site
-    assert_raises(Charted::ExitError) { @cmd.site = 'nomatch' }
-    assert_equal(['No sites matching "nomatch"'], @cmd.output)
-    assert_nil(@cmd.site)
-
-    @cmd.output = nil
-    assert_raises(Charted::ExitError) { @cmd.site = 'l' }
-    assert_equal(['"l" ambiguous: localhost, example.org'], @cmd.output)
-
-    @cmd.site = 'local'
-    assert_equal('localhost', @cmd.site.domain)
-
-    @cmd.site = 'ample'
-    assert_equal('example.org', @cmd.site.domain)
-  end
-
-  def test_clean
-    site = Charted::Site.first(domain: 'localhost')
-    visitor = site.visitors.create
-    visitor.events.create(label: 'Label')
-    visitor.conversions.create(label: 'Label')
-    visitor.experiments.create(label: 'Label', bucket: 'A')
-    @cmd.output = nil
-    @cmd.clean
-    visitor.reload
-    assert_equal(1, visitor.events.size)
-    assert_equal(1, visitor.conversions.size)
-    assert_equal(1, visitor.experiments.size)
-
-    @cmd.output = nil
-    @cmd.clean('Label')
-    visitor.reload
-    assert_equal(0, visitor.events.size)
-    assert_equal(0, visitor.conversions.size)
-    assert_equal(0, visitor.experiments.size)
-  end
-
-  def test_dashboard
-    assert_raises(Charted::ExitError) { @cmd.dashboard }
-    assert_equal(['Please specify website with --site'], @cmd.output)
-    
-    @cmd.output = nil
-    @cmd.site = 'localhost'
-    @cmd.dashboard
-  end
-
-  def test_js
-    @cmd.output = nil
-    @cmd.js
-    assert_match("var Charted", @cmd.output[0])
-  end
-
-  def test_format
-    assert_equal('-10,200', @cmd.send(:format, -10200))
-    assert_equal('-1', @cmd.send(:format, -1))
-    assert_equal('1', @cmd.send(:format, 1))
-    assert_equal('1,200,300', @cmd.send(:format, 1200300))
-  end
-end