vanity 1.5.3 → 1.6.0

data/test/experiment/ab_test.rb

@@ -118,6 +118,21 @@ class AbTestTest < ActionController::TestCase
     assert_equal 1, experiment(:abcd).alternatives.sum(&:conversions)
   end
 
+  # -- use_js! --
+
+  def test_does_not_record_participant_when_using_js
+    Vanity.playground.use_js!
+    ids = (0...10).to_a
+    new_ab_test :foobar do
+      alternatives "foo", "bar"
+      identify { ids.pop }
+      metrics :coolness
+    end
+    10.times { experiment(:foobar).choose }
+    alts = experiment(:foobar).alternatives
+    assert_equal 0, alts.map(&:participants).sum
+  end
+
 
   # -- Running experiment --
 
@@ -127,10 +142,10 @@ class AbTestTest < ActionController::TestCase
       identify { "6e98ec" }
       metrics :coolness
     end
-    assert value = experiment(:foobar).choose
+    assert value = experiment(:foobar).choose.value
     assert_match /foo|bar/, value
     1000.times do
-      assert_equal value, experiment(:foobar).choose
+      assert_equal value, experiment(:foobar).choose.value
     end
   end
 
@@ -140,7 +155,7 @@ class AbTestTest < ActionController::TestCase
       identify { rand }
       metrics :coolness
     end
-    alts = Array.new(1000) { experiment(:foobar).choose }
+    alts = Array.new(1000) { experiment(:foobar).choose.value }
     assert_equal %w{bar foo}, alts.uniq.sort
     assert_in_delta alts.select { |a| a == "foo" }.size, 500, 100 # this may fail, such is propability
   end
@@ -324,7 +339,7 @@ class AbTestTest < ActionController::TestCase
     fake :abcd, :a=>[182, 35], :b=>[180, 45], :c=>[189,28], :d=>[188, 61]
 
     z_scores = experiment(:abcd).score.alts.map { |alt| "%.2f" % alt.z_score }
-    assert_equal %w{-1.33 0.00 -2.47 1.58}, z_scores
+    assert_equal %w{-1.33 0.00 -2.46 1.58}, z_scores
     probabilities = experiment(:abcd).score.alts.map(&:probability)
     assert_equal [90, 0, 99, 90], probabilities
 
@@ -466,7 +481,7 @@ Option C did not convert.
 
     assert_equal <<-TEXT, experiment(:abcd).conclusion.join("\n") << "\n"
 There are 374 participants in this experiment.
-The best choice is option D: it converted at 32.4%.
+The best choice is option D: it converted at 32.4% (1% better than option B).
 This result is not statistically significant, suggest you continue this experiment.
 Option B converted at 32.3%.
 Option A did not convert.
@@ -530,7 +545,7 @@ This experiment did not run long enough to find a clear winner.
   def test_completion_if_fails
     new_ab_test :simple do
       identify { rand }
-      complete_if { fail }
+      complete_if { fail "Testing complete_if raises exception" }
       metrics :coolness
     end
     experiment(:simple).choose
@@ -564,7 +579,7 @@ This experiment did not run long enough to find a clear winner.
     # Run experiment to completion (100 participants)
     results = Set.new
     100.times do
-      results << experiment(:simple).choose
+      results << experiment(:simple).choose.value
       metric(:coolness).track!
     end
     assert results.include?(true) && results.include?(false)
@@ -572,7 +587,7 @@ This experiment did not run long enough to find a clear winner.
 
     # Test that we always get the same choice (true)
     100.times do
-      assert_equal true, experiment(:simple).choose
+      assert_equal true, experiment(:simple).choose.value
       metric(:coolness).track!
     end
     # We don't get to count the 100 participant's conversion, but that's ok.
@@ -592,6 +607,18 @@ This experiment did not run long enough to find a clear winner.
     assert_equal experiment(:quick).alternatives[1], experiment(:quick).outcome
   end
 
+  def test_error_in_completion
+    new_ab_test :quick do
+      outcome_is { raise RuntimeError }
+      metrics :coolness
+    end
+    e = experiment(:quick)
+    e.expects(:warn)
+    assert_nothing_raised do
+      e.complete!
+    end
+  end
+
   def test_outcome_is_returns_nil
     new_ab_test :quick do
       outcome_is { nil }
@@ -612,7 +639,7 @@ This experiment did not run long enough to find a clear winner.
 
   def test_outcome_is_fails
     new_ab_test :quick do
-      outcome_is { fail }
+      outcome_is { fail "Testing outcome_is raising exception" }
       metrics :coolness
     end
     experiment(:quick).complete!
@@ -669,10 +696,54 @@ This experiment did not run long enough to find a clear winner.
     assert_nil experiment(:quick).outcome
   end
 
+  def test_chooses_records_participants
+    new_ab_test :simple do
+      alternatives :a, :b, :c
+      metrics :coolness
+    end
+    experiment(:simple).chooses(:b)
+    assert_equal experiment(:simple).alternatives[1].participants, 1
+  end
+
+  def test_chooses_moves_participant_to_new_alternative
+    new_ab_test :simple do
+      alternatives :a, :b, :c
+      metrics :coolness
+      identify { "1" }
+    end
+    val = experiment(:simple).choose.value
+    alternative = experiment(:simple).alternatives.detect {|a| a.value != val }
+    experiment(:simple).chooses(alternative.value)
+    assert_equal experiment(:simple).choose.value, alternative.value
+    experiment(:simple).chooses(val)
+    assert_equal experiment(:simple).choose.value, val
+  end
+
+  def test_chooses_records_participants_only_once
+    new_ab_test :simple do
+      alternatives :a, :b, :c
+      metrics :coolness
+    end
+    2.times { experiment(:simple).chooses(:b) }
+    assert_equal experiment(:simple).alternatives[1].participants, 1
+  end
+
+  def test_chooses_records_participants_for_new_alternatives
+    new_ab_test :simple do
+      alternatives :a, :b, :c
+      metrics :coolness
+    end
+    experiment(:simple).chooses(:b)
+    experiment(:simple).chooses(:c)
+    assert_equal experiment(:simple).alternatives[1].participants, 1
+    assert_equal experiment(:simple).alternatives[2].participants, 1
+  end
+
   def test_no_collection_and_chooses
     not_collecting!
     new_ab_test :simple do
       alternatives :a, :b, :c
+      metrics :coolness
     end
     assert !experiment(:simple).showing?(experiment(:simple).alternatives[1])
     experiment(:simple).chooses(:b)
@@ -684,10 +755,11 @@ This experiment did not run long enough to find a clear winner.
     not_collecting!
     new_ab_test :simple do
       alternatives :a, :b, :c
+      metrics :coolness
     end
-    choice = experiment(:simple).choose
+    choice = experiment(:simple).choose.value
     assert [:a, :b, :c].include?(choice)
-    assert_equal choice, experiment(:simple).choose
+    assert_equal choice, experiment(:simple).choose.value
   end
 
 

data/test/experiment/base_test.rb

@@ -132,5 +132,19 @@ class ExperimentTest < Test::Unit::TestCase
     new_ab_test(:ice_cream_flavor) { metrics :happiness }
     experiment(:ice_cream_flavor).complete!
   end
+
+  # -- completion -- #
+  
+  # check_completion is called by derived classes, but since it's
+  # part of the base_test I'm testing it here.
+  def test_error_in_check_completion
+    new_ab_test(:ab) { metrics :happiness }
+    e = experiment(:ab)
+    e.complete_if { true }
+    e.stubs(:complete!).raises(RuntimeError, "A forced error")
+    e.expects(:warn)
+    e.stubs(:identity).returns(:b)
+    e.track!(:a, Time.now, 10)
+  end
  
 end

data/test/myapp/log/production.log

@@ -3179,3 +3179,168 @@ Completed in 7ms (View: 1 | 200 OK [http://:? ]
 Processing MainController#index (for  at 2011-04-11 15:57:26) [GET]
   Parameters: {" "=>nil}
 Completed in 7ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-04-25 19:24:33) [GET]
+  Parameters: {" "=>nil}
+Completed in 6ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-04-25 19:26:00) [GET]
+  Parameters: {" "=>nil}
+Completed in 6ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-04-25 19:27:11) [GET]
+  Parameters: {" "=>nil}
+Completed in 8ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-04-25 19:29:07) [GET]
+  Parameters: {" "=>nil}
+Completed in 7ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-04-25 19:31:28) [GET]
+  Parameters: {" "=>nil}
+Completed in 7ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-04-25 19:59:03) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-04-25 19:59:52) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-05-28 21:17:06) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-05-28 21:19:49) [GET]
+  Parameters: {" "=>nil}
+Completed in 11ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-05-28 21:22:33) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-06-08 21:30:59) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-06-16 10:17:11) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-18 20:29:45) [GET]
+  Parameters: {" "=>nil}
+Completed in 6ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-18 20:31:56) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-18 20:34:07) [GET]
+  Parameters: {" "=>nil}
+Completed in 6ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-18 20:34:35) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-18 20:35:51) [GET]
+  Parameters: {" "=>nil}
+Completed in 2ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-18 20:37:01) [GET]
+  Parameters: {" "=>nil}
+Completed in 5ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-18 20:37:43) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-18 20:38:23) [GET]
+  Parameters: {" "=>nil}
+Completed in 10ms (View: 2 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-18 20:51:29) [GET]
+  Parameters: {" "=>nil}
+Completed in 9ms (View: 2 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-18 20:52:27) [GET]
+  Parameters: {" "=>nil}
+Completed in 4ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-18 23:51:49) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-19 09:29:26) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-19 10:03:46) [GET]
+  Parameters: {" "=>nil}
+Completed in 2ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-19 10:05:27) [GET]
+  Parameters: {" "=>nil}
+Completed in 3ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-19 10:05:58) [GET]
+  Parameters: {" "=>nil}
+Completed in 2ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-19 10:06:23) [GET]
+  Parameters: {" "=>nil}
+Completed in 8ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-19 10:06:43) [GET]
+  Parameters: {" "=>nil}
+Completed in 2ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-19 10:07:19) [GET]
+  Parameters: {" "=>nil}
+Completed in 2ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-19 10:09:19) [GET]
+  Parameters: {" "=>nil}
+Completed in 4ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-20 11:52:11) [GET]
+  Parameters: {" "=>nil}
+Completed in 2ms (View: 1 | 200 OK [http://:? ]
+
+
+Processing MainController#index (for  at 2011-07-20 11:53:47) [GET]
+  Parameters: {" "=>nil}
+Completed in 6ms (View: 1 | 200 OK [http://:? ]

data/test/playground_test.rb

@@ -7,4 +7,14 @@ class PlaygroundTest < Test::Unit::TestCase
     assert_equal instance, Vanity.playground
   end
 
+  def test_be_use_js
+    assert !Vanity.playground.using_js?
+    Vanity.playground.use_js!
+    assert Vanity.playground.using_js?
+  end
+
+  def test_chooses_path_sets_default
+    assert_equal Vanity.playground.add_participant_path, Vanity::Playground::DEFAULT_ADD_PARTICIPANT_PATH
+  end
+
 end

data/test/rails_dashboard_test.rb

@@ -0,0 +1,37 @@
+require "test/test_helper"
+
+class VanityController < ActionController::Base
+  include Vanity::Rails::Dashboard
+end
+
+# Pages accessible to everyone, e.g. sign in, community search.
+class RailsDashboardTest < ActionController::TestCase
+  tests VanityController
+
+  def setup
+    Vanity.playground.collecting = true
+    metric :sugar_high
+    new_ab_test :food do
+      alternatives :apple, :orange
+      metrics :sugar_high
+      identify { '1' }
+    end
+  end
+
+  def test_add_participant
+    xhr :post, :add_participant, :e => "food", :a => 0
+    assert_response :success
+    assert @response.body.blank?
+  end
+
+  def test_add_participant_no_params
+    xhr :post, :add_participant
+    assert_response :not_found
+    assert @response.body.blank?
+  end
+
+  def test_chooses
+    xhr :post, :chooses, :e => "food", :a => 0
+    assert_response :success
+  end
+end

data/test/rails_helper_test.rb

@@ -0,0 +1,28 @@
+require "test/test_helper"
+
+class RailsHelperTest < ActionView::TestCase
+  include Vanity::Rails::Helpers
+
+  def setup
+    super
+    metric :sugar_high
+    new_ab_test :pie_or_cake do
+      metrics :sugar_high
+      identify { '1' }
+      alternatives :pie, :cake
+    end
+  end
+
+  def test_ab_test_returns_one_of_the_alternatives
+    assert [:pie, :cake].include?(ab_test(:pie_or_cake))
+  end
+
+  def test_ab_test_using_js_returns_the_same_alternative
+    Vanity.playground.use_js!
+    result = ab_test(:pie_or_cake)
+    assert [:pie, :cake].include?(result)
+    10.times do 
+      assert result == ab_test(:pie_or_cake)
+    end
+  end
+end

data/test/rails_test.rb

@@ -21,8 +21,22 @@ class UseVanityTest < ActionController::TestCase
     UseVanityController.class_eval do
       use_vanity :current_user
     end
+    if ::Rails.respond_to?(:application) # Rails 3 configuration
+      ::Rails.application.config.session_options[:domain] = '.foo.bar'
+    end
+  end
+
+  def test_chooses_sets_alternatives_for_rails_tests
+    experiment(:pie_or_cake).chooses(true)
+    get :index
+    assert_equal 'true', @response.body
+ 
+    experiment(:pie_or_cake).chooses(false)
+    get :index
+    assert_equal 'false', @response.body
   end
 
+
   def test_vanity_cookie_is_persistent
     get :index
     assert cookie = @response["Set-Cookie"].find { |c| c[/^vanity_id=/] }
@@ -81,22 +95,28 @@ class UseVanityTest < ActionController::TestCase
 
   def test_sets_choices_from_vanity_query_parameter
     first = experiment(:pie_or_cake).alternatives.first
-    # experiment(:pie_or_cake).fingerprint(first)
+    fingerprint = experiment(:pie_or_cake).fingerprint(first)
     10.times do
       @controller = nil ; setup_controller_request_and_response
-      get :index, :_vanity=>"aae9ff8081"
-      assert !experiment(:pie_or_cake).choose
+      get :index, :_vanity => fingerprint
+      assert_equal experiment(:pie_or_cake).choose, experiment(:pie_or_cake).alternatives.first
       assert experiment(:pie_or_cake).showing?(first)
     end
   end
 
   def test_does_nothing_with_vanity_query_parameter_for_posts
+    experiment(:pie_or_cake).chooses(experiment(:pie_or_cake).alternatives.last.value)
     first = experiment(:pie_or_cake).alternatives.first
-    post :index, :foo=>"bar", :_vanity=>"567"
+    fingerprint = experiment(:pie_or_cake).fingerprint(first)
+    post :index, :foo => "bar", :_vanity => fingerprint
     assert_response :success
     assert !experiment(:pie_or_cake).showing?(first)
   end
 
+  def test_cookie_domain_from_rails_configuration
+    get :index
+    assert_equal cookies["vanity_id"][:domain], '.foo.bar' if ::Rails.respond_to?(:application)
+  end
 
   # -- Load path --
 
@@ -160,6 +180,55 @@ $stdout << Vanity.playground.connection
     File.unlink "tmp/config/vanity.yml"
   end
 
+  def test_mongo_connection_from_yaml
+    FileUtils.mkpath "tmp/config"
+    File.open("tmp/config/vanity.yml", "w") do |io|
+      io.write <<-YML
+mongodb:
+  adapter: mongodb
+  host: localhost
+  port: 27017
+  database: vanity_test
+      YML
+    end
+
+    ENV["RAILS_ENV"] = "mongodb"
+    assert_equal "mongodb://localhost:27017/vanity_test", load_rails(<<-RB)
+initializer.after_initialize
+$stdout << Vanity.playground.connection
+    RB
+  ensure
+    File.unlink "tmp/config/vanity.yml"
+  end
+
+  def test_mongodb_replica_set_connection
+    FileUtils.mkpath "tmp/config"
+    File.open("tmp/config/vanity.yml", "w") do |io|
+      io.write <<-YML
+mongodb:
+  adapter: mongodb
+  hosts:
+    - localhost
+  port: 27017
+  database: vanity_test
+      YML
+    end
+
+    ENV["RAILS_ENV"] = "mongodb"
+    assert_equal "mongodb://localhost:27017/vanity_test", load_rails(<<-RB)
+initializer.after_initialize
+$stdout << Vanity.playground.connection
+    RB
+
+    ENV["RAILS_ENV"] = "mongodb"
+    assert_equal "Mongo::ReplSetConnection", load_rails(<<-RB)
+initializer.after_initialize
+$stdout << Vanity.playground.connection.mongo.class
+    RB
+  ensure
+    File.unlink "tmp/config/vanity.yml"
+  end
+
   def test_connection_from_yaml_url
     FileUtils.mkpath "tmp/config"
     ENV["RAILS_ENV"] = "production"

data/test/test_helper.rb

@@ -6,6 +6,7 @@ require "test/unit"
 require "mocha"
 require "action_controller"
 require "action_controller/test_case"
+require "action_view/test_case"
 require "active_record"
 require "initializer"
 Rails.configuration = Rails::Configuration.new
@@ -21,14 +22,11 @@ if $VERBOSE
 end
 
 class Test::Unit::TestCase
-  include WebMock
+  include WebMock::API
 
   def setup
     FileUtils.mkpath "tmp/experiments/metrics"
     new_playground
-    #WebMock.after_request do |request_signature, response|
-    #  puts "Request #{request_signature} was made and #{response} was returned"
-    #end
   end
 
   # Call this on teardown. It wipes put the playground and any state held in it
@@ -92,7 +90,7 @@ class Test::Unit::TestCase
     Vanity.context = nil
     FileUtils.rm_rf "tmp"
     Vanity.playground.connection.flushdb if Vanity.playground.connected?
-    WebMock.reset_webmock
+    WebMock.reset!
   end
 
 end
@@ -103,7 +101,7 @@ end
 
 
 ActiveRecord::Base.logger = $logger
-ActiveRecord::Base.establish_connection :adapter=>"sqlite3", :database=>File.expand_path("database.sqlite")
+ActiveRecord::Base.establish_connection :adapter=>"mysql", :database=>"vanity_test"
 
 
 class Array

data/vanity.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.8.7'
   spec.add_dependency "redis", "~>2.0"
-  spec.add_dependency "redis-namespace", "~>0.7"
+  spec.add_dependency "redis-namespace", "~>1.0.0"
 end