vanity 1.8.1 → 1.8.2

data/test/experiment/base_test.rb

@@ -108,7 +108,9 @@ class ExperimentTest < Test::Unit::TestCase
  
   def test_experiment_keeps_created_timestamp_across_definitions
     past = Date.today - 1
-    Timecop.freeze past do
+    Timecop.freeze past.to_time do
+      puts "timecop: #{Time.now.to_i}"
+      assert_equal past.to_time.to_i, Time.now.to_i
       new_ab_test(:ice_cream_flavor) { metrics :happiness }
       assert_equal past.to_time.to_i, experiment(:ice_cream_flavor).created_at.to_i
     end

data/test/metric/base_test.rb

@@ -86,8 +86,8 @@ context "Metric tracking" do
 
   test "can tell the time" do
     metric "Yawns/sec"
-    Timecop.freeze(today - 4) { 4.times { Vanity.playground.track! :yawns_sec } }
-    Timecop.freeze(today - 2) { 2.times { Vanity.playground.track! :yawns_sec } }
+    Timecop.freeze((today - 4).to_time) { 4.times { Vanity.playground.track! :yawns_sec } }
+    Timecop.freeze((today - 2).to_time) { 2.times { Vanity.playground.track! :yawns_sec } }
     1.times { Vanity.playground.track! :yawns_sec }
     boredom = Vanity.playground.metric(:yawns_sec).values(today - 5, today)
     assert_equal [0,4,0,2,0,1], boredom
@@ -103,8 +103,8 @@ context "Metric tracking" do
 
   test "with count" do
     metric "Yawns/sec"
-    Timecop.freeze(today - 4) { Vanity.playground.track! :yawns_sec, 4 }
-    Timecop.freeze(today - 2) { Vanity.playground.track! :yawns_sec, 2 }
+    Timecop.freeze((today - 4).to_time) { Vanity.playground.track! :yawns_sec, 4 }
+    Timecop.freeze((today - 2).to_time) { Vanity.playground.track! :yawns_sec, 2 }
     Vanity.playground.track! :yawns_sec
     boredom = Vanity.playground.metric(:yawns_sec).values(today - 5, today)
     assert_equal [0,4,0,2,0,1], boredom
@@ -243,8 +243,8 @@ end
 context "Metric data" do
   test "explicit dates" do
     metric "Yawns/sec"
-    Timecop.freeze(today - 4) { Vanity.playground.track! :yawns_sec, 4 }
-    Timecop.freeze(today - 2) { Vanity.playground.track! :yawns_sec, 2 }
+    Timecop.freeze((today - 4).to_time) { Vanity.playground.track! :yawns_sec, 4 }
+    Timecop.freeze((today - 2).to_time) { Vanity.playground.track! :yawns_sec, 2 }
     Vanity.playground.track! :yawns_sec
     boredom = Vanity::Metric.data(Vanity.playground.metric(:yawns_sec), Date.today - 5, Date.today)
     assert_equal [[today - 5, 0], [today - 4, 4], [today - 3, 0], [today - 2, 2], [today - 1, 0], [today, 1]], boredom
@@ -252,8 +252,8 @@ context "Metric data" do
 
   test "start date only" do
     metric "Yawns/sec"
-    Timecop.freeze(today - 4) { Vanity.playground.track! :yawns_sec, 4 }
-    Timecop.freeze(today - 2) { Vanity.playground.track! :yawns_sec, 2 }
+    Timecop.freeze((today - 4).to_time) { Vanity.playground.track! :yawns_sec, 4 }
+    Timecop.freeze((today - 2).to_time) { Vanity.playground.track! :yawns_sec, 2 }
     Vanity.playground.track! :yawns_sec
     boredom = Vanity::Metric.data(Vanity.playground.metric(:yawns_sec), Date.today - 4)
     assert_equal [[today - 4, 4], [today - 3, 0], [today - 2, 2], [today - 1, 0], [today, 1]], boredom
@@ -261,8 +261,8 @@ context "Metric data" do
 
   test "start date and duration" do
     metric "Yawns/sec"
-    Timecop.freeze(today - 4) { Vanity.playground.track! :yawns_sec, 4 }
-    Timecop.freeze(today - 2) { Vanity.playground.track! :yawns_sec, 2 }
+    Timecop.freeze((today - 4).to_time) { Vanity.playground.track! :yawns_sec, 4 }
+    Timecop.freeze((today - 2).to_time) { Vanity.playground.track! :yawns_sec, 2 }
     Vanity.playground.track! :yawns_sec
     boredom = Vanity::Metric.data(Vanity.playground.metric(:yawns_sec), 5)
     assert_equal [[today - 4, 4], [today - 3, 0], [today - 2, 2], [today - 1, 0], [today, 1]], boredom

data/test/passenger_test.rb

@@ -16,10 +16,14 @@ class PassengerTest < Test::Unit::TestCase
     @server.start
     Thread.pass until @server.started?
     app_root = File.expand_path("myapp", File.dirname(__FILE__))
-    @app = @server.spawn_application "app_root"=>app_root, "spawn_method"=>"smart-lv2"
+    @app = @server.spawn_application "app_root"=>app_root, "spawn_method"=>"smart"
   end
 
   def test_reconnect
+    # When using AR adapter, we're not responsible to reconnect, and we're going
+    # to get the same "connect" (AR connection handler) either way.
+    # return if defined?(Vanity::Adapters::ActiveRecordAdapter) && Vanity::Adapters::ActiveRecordAdapter === Vanity.playground.connection
+
     sleep 0.1
     case @app.listen_socket_type
     when "tcp" ; socket = TCPSocket.new(*@app.listen_socket_name.split(":"))
@@ -38,7 +42,9 @@ class PassengerTest < Test::Unit::TestCase
 
   def teardown
     super
+    @server.cleanup
     @server.stop
+    Process.kill('SIGKILL', @app.pid.to_i) # Just in case...KIDS, GET OUT OF THE POOL!
     File.unlink "test/myapp/config/vanity.yml"
   end
 end

data/test/playground_test.rb

@@ -23,4 +23,15 @@ class PlaygroundTest < Test::Unit::TestCase
     assert_equal Vanity.playground.connection.to_s, "mock:/"
   end
 
+  def test_autoconnect_establishes_connection_by_default
+    instance = Vanity::Playground.new(:connection=>"mock:/")
+    assert instance.connected?
+  end
+
+  def test_autoconnect_can_skip_connection
+    Vanity::Autoconnect.stubs(:playground_should_autoconnect?).returns(false)
+    instance = Vanity::Playground.new(:connection=>"mock:/")
+    assert !instance.connected?
+  end
+
 end

data/test/rails_test.rb

@@ -41,7 +41,7 @@ class UseVanityControllerTest < ActionController::TestCase
     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
@@ -98,17 +98,17 @@ class UseVanityControllerTest < ActionController::TestCase
     get :index
     assert_equal "576", @controller.send(:vanity_identity)
   end
-  
+
   def test_vanity_identity_set_with_indentity_paramater
     get :index, :_identity => "id_from_params"
     assert_equal "id_from_params", @controller.send(:vanity_identity)
-    
+
     @request.cookies['vanity_id'] = "old_id"
     get :index, :_identity => "id_from_params"
     assert_equal "id_from_params", @controller.send(:vanity_identity)
     assert cookies['vanity_id'], "id_from_params"
   end
-  
+
   # query parameter filter
 
   def test_redirects_and_loses_vanity_query_parameter
@@ -140,52 +140,114 @@ class UseVanityControllerTest < ActionController::TestCase
     get :index, :_identity => "123", :_track => "sugar_high"
     assert_equal experiment(:pie_or_cake).alternatives[0].converted, 1
   end
-  
+
   def test_cookie_domain_from_rails_configuration
     get :index
     assert_match /domain=.foo.bar/, @response["Set-Cookie"] if ::Rails.respond_to?(:application)
   end
 
-  # -- Load path --
+  def teardown
+    super
+    if !rails3?
+      UseVanityController.send(:filter_chain).clear
+    end
+  end
+
+end
+
+class VanityMailer < ActionMailer::Base
+  include Vanity::Rails::Helpers
+  include ActionView::Helpers::AssetTagHelper
+  include ActionView::Helpers::TagHelper
+
+  def ab_test_subject(user, forced_outcome=true)
+    use_vanity_mailer user
+    experiment(:pie_or_cake).chooses(forced_outcome)
+
+    if defined?(Rails::Railtie)
+      mail :subject =>ab_test(:pie_or_cake).to_s
+    else
+      subject ab_test(:pie_or_cake).to_s
+      body ""
+    end
+  end
+
+  def ab_test_content(user)
+    use_vanity_mailer user
+
+    if defined?(Rails::Railtie)
+      mail do |format|
+        format.html { render :text=>view_context.vanity_tracking_image(Vanity.context.vanity_identity, :open, :host => "127.0.0.1:3000") }
+      end
+    else
+      body vanity_tracking_image(Vanity.context.vanity_identity, :open, :host => "127.0.0.1:3000")
+    end
+  end
+end
+
+class UseVanityMailerTest < ActionMailer::TestCase
+  tests VanityMailer
+
+  def setup
+    super
+    metric :sugar_high
+    new_ab_test :pie_or_cake do
+      metrics :sugar_high
+    end
+  end
+
+  def test_js_enabled_still_adds_participant
+    Vanity.playground.use_js!
+    rails3? ? VanityMailer.ab_test_subject(nil, true) : VanityMailer.deliver_ab_test_subject(nil, true)
+
+    alts = experiment(:pie_or_cake).alternatives
+    assert_equal 1, alts.map(&:participants).sum
+  end
+
+  def test_returns_different_alternatives
+    email = rails3? ? VanityMailer.ab_test_subject(nil, true) : VanityMailer.deliver_ab_test_subject(nil, true)
+    assert_equal 'true', email.subject
+
+    email = rails3? ? VanityMailer.ab_test_subject(nil, false) : VanityMailer.deliver_ab_test_subject(nil, false)
+    assert_equal 'false', email.subject
+  end
+
+  def test_tracking_image_is_rendered
+    email = rails3? ? VanityMailer.ab_test_content(nil) : VanityMailer.deliver_ab_test_content(nil)
+    assert email.body =~ /<img/
+    assert email.body =~ /_identity=/
+  end
+end
+
+class LoadPathAndConnectionConfigurationTest < Test::Unit::TestCase
 
   def test_load_path
-    assert_equal File.expand_path("tmp/experiments"), load_rails(<<-RB)
-initializer.after_initialize
+    assert_equal File.expand_path("tmp/experiments"), load_rails("", <<-RB)
 $stdout << Vanity.playground.load_path
     RB
   end
 
   def test_settable_load_path
-    assert_equal File.expand_path("tmp/predictions"), load_rails(<<-RB)
-Vanity.playground.load_path = "predictions"
-initializer.after_initialize
+    assert_equal File.expand_path("tmp/predictions"), load_rails(%Q{\nVanity.playground.load_path = "predictions"\n}, <<-RB)
 $stdout << Vanity.playground.load_path
     RB
   end
 
   def test_absolute_load_path
-    assert_equal File.expand_path("/tmp/var"), load_rails(<<-RB)
-Vanity.playground.load_path = "/tmp/var"
-initializer.after_initialize
+    assert_equal File.expand_path("/tmp/var"), load_rails(%Q{\nVanity.playground.load_path = "/tmp/var"\n}, <<-RB)
 $stdout << Vanity.playground.load_path
     RB
   end
 
-
-  # -- Connection configuration --
-
   if ENV['DB'] == 'redis'
     def test_default_connection
-      assert_equal "redis://127.0.0.1:6379/0", load_rails(<<-RB)
-initializer.after_initialize
+      assert_equal "redis://127.0.0.1:6379/0", load_rails("", <<-RB)
 $stdout << Vanity.playground.connection
       RB
     end
 
     def test_connection_from_string
-      assert_equal "redis://192.168.1.1:6379/5", load_rails(<<-RB)
-Vanity.playground.establish_connection "redis://192.168.1.1:6379/5"
-initializer.after_initialize
+      assert_equal "redis://192.168.1.1:6379/5", load_rails(%Q{\nVanity.playground.establish_connection "redis://192.168.1.1:6379/5"\n}, <<-RB)
 $stdout << Vanity.playground.connection
       RB
     end
@@ -201,8 +263,7 @@ production:
   database: 15
         YML
       end
-      assert_equal "redis://somehost:6379/15", load_rails(<<-RB)
-initializer.after_initialize
+      assert_equal "redis://somehost:6379/15", load_rails("", <<-RB)
 $stdout << Vanity.playground.connection
       RB
     ensure
@@ -217,8 +278,7 @@ $stdout << Vanity.playground.connection
 production: redis://somehost/15
         YML
       end
-      assert_equal "redis://somehost:6379/15", load_rails(<<-RB)
-initializer.after_initialize
+      assert_equal "redis://somehost:6379/15", load_rails("", <<-RB)
 $stdout << Vanity.playground.connection
       RB
     ensure
@@ -235,8 +295,7 @@ $stdout << Vanity.playground.connection
 production: <%= ENV['REDIS_URL'] %>
         YML
       end
-      assert_equal "redis://somehost:6379/15", load_rails(<<-RB)
-initializer.after_initialize
+      assert_equal "redis://somehost:6379/15", load_rails("", <<-RB)
 $stdout << Vanity.playground.connection
       RB
     ensure
@@ -248,14 +307,13 @@ $stdout << Vanity.playground.connection
       yml = File.open("tmp/config/redis.yml", "w")
       yml << "production: internal.local:6379\n"
       yml.flush
-      assert_equal "redis://internal.local:6379/0", load_rails(<<-RB)
-initializer.after_initialize
+      assert_equal "redis://internal.local:6379/0", load_rails("", <<-RB)
 $stdout << Vanity.playground.connection
       RB
     ensure
       File.unlink yml.path
     end
-  
+
 
   end
 
@@ -272,8 +330,7 @@ mongodb:
         YML
       end
 
-      assert_equal "mongodb://localhost:27017/vanity_test", load_rails(<<-RB, "mongodb")
-initializer.after_initialize
+      assert_equal "mongodb://localhost:27017/vanity_test", load_rails("", <<-RB, "mongodb")
 $stdout << Vanity.playground.connection
       RB
     ensure
@@ -294,13 +351,11 @@ mongodb:
           YML
         end
 
-        assert_equal "mongodb://localhost:27017/vanity_test", load_rails(<<-RB, "mongodb")
-initializer.after_initialize
+        assert_equal "mongodb://localhost:27017/vanity_test", load_rails("", <<-RB, "mongodb")
 $stdout << Vanity.playground.connection
         RB
 
-        assert_equal "Mongo::ReplSetConnection", load_rails(<<-RB, "mongodb")
-initializer.after_initialize
+        assert_equal "Mongo::ReplSetConnection", load_rails("", <<-RB, "mongodb")
 $stdout << Vanity.playground.connection.mongo.class
         RB
       ensure
@@ -317,8 +372,7 @@ production:
   adapter: redis
       YML
     end
-    assert_equal "No configuration for development", load_rails(<<-RB, "development")
-initializer.after_initialize
+    assert_equal "No configuration for development", load_rails("", <<-RB, "development")
 $stdout << (Vanity.playground.connection rescue $!.message)
     RB
   ensure
@@ -333,8 +387,7 @@ production:
   collecting: false
       YML
     end
-    assert_equal "false", load_rails(<<-RB)
-initializer.after_initialize
+    assert_equal "false", load_rails("", <<-RB)
 $stdout << Vanity.playground.collecting?
     RB
   ensure
@@ -342,71 +395,99 @@ $stdout << Vanity.playground.collecting?
   end
 
   def test_collection_true_in_production_by_default
-    assert_equal "true", load_rails(<<-RB, "production")
-initializer.after_initialize
+    assert_equal "true", load_rails("", <<-RB)
 $stdout << Vanity.playground.collecting?
     RB
   end
 
   def test_collection_false_in_production_when_configured
-    assert_equal "false", load_rails(<<-RB, "production")
-Vanity.playground.collecting = false
-initializer.after_initialize
+    assert_equal "false", load_rails("\nVanity.playground.collecting = false\n", <<-RB)
 $stdout << Vanity.playground.collecting?
     RB
   end
 
   def test_collection_false_in_development_by_default
-    assert_equal "false", load_rails(<<-RB, "development")
-initializer.after_initialize
+    assert_equal "false", load_rails("", <<-RB, "development")
 $stdout << Vanity.playground.collecting?
     RB
   end
 
   def test_collection_true_in_development_when_configured
-    assert_equal "true", load_rails(<<-RB, "development")
-Vanity.playground.collecting = true
-initializer.after_initialize
+    assert_equal "true", load_rails("\nVanity.playground.collecting = true\n", <<-RB, "development")
 $stdout << Vanity.playground.collecting?
     RB
   end
 
   def test_collection_false_after_test!
-    assert_equal "false", load_rails(<<-RB, "production")
-initializer.after_initialize
+    assert_equal "false", load_rails("", <<-RB)
 Vanity.playground.test!
 $stdout << Vanity.playground.collecting?
     RB
   end
 
-  def load_rails(code, env = "production")
+  def load_rails(before_initialize, after_initialize, env="production")
     tmp = Tempfile.open("test.rb")
-    tmp.write <<-RB
+    begin
+      code_setup = <<-RB
 $:.delete_if { |path| path[/gems\\/vanity-\\d/] }
 $:.unshift File.expand_path("../lib")
 RAILS_ROOT = File.expand_path(".")
+      RB
+      code = code_setup
+      code += defined?(Rails::Railtie) ? load_rails_3(env) : load_rails_2(env)
+      code += %Q{\nrequire "vanity"\n}
+      code += before_initialize
+      code += defined?(Rails::Railtie) ? initialize_rails_3 : initialize_rails_2
+      code += after_initialize
+      tmp.write code
+      tmp.flush
+      Dir.chdir "tmp" do
+        open("| ruby #{tmp.path}").read
+      end
+    ensure
+      tmp.close!
+    end
+  end
+
+  def load_rails_2(env)
+    <<-RB
 RAILS_ENV = ENV['RACK_ENV'] = "#{env}"
 require "initializer"
 require "active_support"
 Rails.configuration = Rails::Configuration.new
 initializer = Rails::Initializer.new(Rails.configuration)
 initializer.check_gem_dependencies
-require "vanity"
     RB
-    tmp.write code
-    tmp.flush
-    Dir.chdir "tmp" do
-      open("|ruby #{tmp.path}").read
-    end
-  rescue
-    tmp.close!
   end
 
+  def load_rails_3(env)
+    <<-RB
+ENV['BUNDLE_GEMFILE'] ||= "#{ENV['BUNDLE_GEMFILE']}"
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+ENV['RAILS_ENV'] = ENV['RACK_ENV'] = "#{env}"
+require "active_model/railtie"
+require "action_controller/railtie"
 
-  def teardown
-    super
-    if !rails3?
-      UseVanityController.send(:filter_chain).clear
-    end
+Bundler.require(:default)
+
+module Foo
+  class Application < Rails::Application
+    config.active_support.deprecation = :notify
   end
+end
+    RB
+  end
+
+  def initialize_rails_2
+    <<-RB
+initializer.after_initialize
+    RB
+  end
+
+  def initialize_rails_3
+    <<-RB
+Foo::Application.initialize!
+    RB
+  end
+
 end