vanity 2.2.10 → 3.0.0

data/lib/vanity/version.rb

@@ -1,5 +1,5 @@
 module Vanity
-  VERSION = "2.2.10"
+  VERSION = "3.0.0"
 
   module Version
     version = VERSION.to_s.split(".").map { |i| i.to_i }

data/test/adapters/redis_adapter_test.rb

@@ -18,17 +18,13 @@ describe Vanity::Adapters::RedisAdapter do
 
   include Vanity::Adapters::SharedTests
 
-  it "warns on disconnect error" do
+  it "disconnects" do
     if defined?(Redis)
-      assert_silent do
-        Redis.any_instance.stubs(:connect!)
-        mocked_redis = stub("Redis")
-        mocked_redis.expects(:client).raises(RuntimeError)
-        redis_adapter = Vanity::Adapters::RedisAdapter.new({})
-        redis_adapter.stubs(:redis).returns(mocked_redis)
-        Vanity.logger.expects(:warn).with("Error while disconnecting from redis: RuntimeError")
-        redis_adapter.disconnect!
-      end
+      mocked_redis = stub("Redis")
+      mocked_redis.expects(:disconnect!)
+      redis_adapter = Vanity::Adapters::RedisAdapter.new({})
+      redis_adapter.stubs(:redis).returns(mocked_redis)
+      redis_adapter.disconnect!
     end
   end
 
@@ -75,7 +71,7 @@ describe Vanity::Adapters::RedisAdapter do
 
   it "gracefully fails in #ab_show" do
     redis_adapter, mocked_redis = stub_redis
-    mocked_redis.stubs(:[]=).raises(RuntimeError)
+    mocked_redis.stubs(:set).raises(RuntimeError)
 
     assert_silent do
       redis_adapter.ab_show("price_options", "3ff62e2fb51f0b22646a342a2d357aec", 0)
@@ -84,7 +80,7 @@ describe Vanity::Adapters::RedisAdapter do
 
   it "gracefully fails in #ab_showing" do
     redis_adapter, mocked_redis = stub_redis
-    mocked_redis.stubs(:[]).raises(RuntimeError)
+    mocked_redis.stubs(:get).raises(RuntimeError)
 
     assert_silent do
       redis_adapter.ab_showing("price_options", "3ff62e2fb51f0b22646a342a2d357aec")

data/test/adapters/shared_tests.rb

@@ -123,6 +123,10 @@ module Vanity::Adapters::SharedTests
             @subject.destroy_experiment(experiment)
 
             refute(@subject.experiment_persisted?(experiment))
+            assert_equal(
+              { :participants => 0, :converted => 0, :conversions => 0 },
+              @subject.ab_counts(experiment, alternative)
+            )
           end
         end
 
@@ -272,8 +276,7 @@ module Vanity::Adapters::SharedTests
           end
 
           it 'returns nil if the identity has no assignment' do
-            assert_equal(
-              nil,
+            assert_nil(
               @subject.ab_assigned(experiment, identity)
             )
           end
@@ -301,8 +304,7 @@ module Vanity::Adapters::SharedTests
           end
 
           it 'returns nil otherwise' do
-            assert_equal(
-              nil,
+            assert_nil(
               @subject.ab_get_outcome(experiment)
             )
           end
@@ -324,8 +326,7 @@ module Vanity::Adapters::SharedTests
             @subject.ab_show(experiment, identity, alternative)
             @subject.ab_not_showing(experiment, identity)
 
-            assert_equal(
-              nil,
+            assert_nil(
               @subject.ab_showing(experiment, identity)
             )
           end

data/test/commands/report_test.rb

@@ -6,6 +6,15 @@ describe Vanity::Commands do
     metric "Coolness"
   end
 
+  def with_captured_stdout
+    original_stdout = $stdout
+    $stdout = StringIO.new
+    yield
+    $stdout.string
+  ensure
+    $stdout = original_stdout
+  end
+
   describe ".report" do
     describe "given file" do
       let(:file) { "tmp/config/redis.yml" }
@@ -20,7 +29,10 @@ describe Vanity::Commands do
         experiment(:foobar).choose
 
         FileUtils.mkpath "tmp/config"
-        Vanity::Commands.report(file)
+
+        with_captured_stdout do
+          Vanity::Commands.report(file)
+        end
       end
 
       after do

data/test/configuration_test.rb

@@ -113,6 +113,19 @@ describe Vanity::Configuration do
   end
 
   describe "setup_locales" do
-    it "adds vanity locales to the gem"
+    it "adds vanity locales to the I18n gem" do
+      begin
+        original_load_path = I18n.load_path
+
+        config.setup_locales
+
+        assert_includes(
+          I18n.load_path,
+          File.expand_path(File.join(__FILE__, '..', '..', 'lib/vanity/locales/vanity.en.yml'))
+        )
+      ensure
+        I18n.load_path = original_load_path
+      end
+    end
   end
-end
+end

data/test/dummy/app/mailers/vanity_mailer.rb

@@ -12,8 +12,10 @@ class VanityMailer < ActionMailer::Base
   def ab_test_content(user)
     use_vanity_mailer user
 
+    image_html = view_context.vanity_tracking_image(Vanity.context.vanity_identity, :open, :host => "127.0.0.1:3000")
+
     mail do |format|
-      format.html { render :text=>view_context.vanity_tracking_image(Vanity.context.vanity_identity, :open, :host => "127.0.0.1:3000") }
+      format.html { render :html=>image_html.html_safe }
     end
   end
 end

data/test/dummy/config/routes.rb

@@ -52,7 +52,21 @@ Dummy::Application.routes.draw do
 
   # See how all your routes lay out with "rake routes"
 
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  match ':controller(/:action(/:id(.:format)))', :via => [:get, :post]
+  get '/use_vanity(/:id(.:format))', controller: :use_vanity, action: :index
+
+  %w(js view_helper_ab_test_js global_ab_test_js model_js).each do |action|
+    get "/use_vanity/#{action}(/:id(.:format))", controller: :use_vanity, action: action
+  end
+
+  %w(track test_capture test_render test_view).each do |action|
+    get "/ab_test/#{action}(/:id(.:format))", controller: :ab_test, action: action
+  end
+
+  %w(reset disable enable chooses add_participant complete).each do |action|
+    post "/vanity(/#{action}(/:id(.:format)))", controller: :vanity, action: action
+  end
+
+  %w(index participant image).each do |action|
+    get "/vanity(/#{action}(/:id(.:format)))", controller: :vanity, action: action
+  end
 end

data/test/experiment/ab_test.rb

@@ -529,12 +529,12 @@ class AbTestTest < ActionController::TestCase
       identify { "6e98ec" }
       metrics :coolness
     end
-    assert_equal nil, experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, "6e98ec")
+    assert_nil experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, "6e98ec")
     assert id = experiment(:foobar).choose.id
     assert_equal id, experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, "6e98ec")
   end
 
-  def test_ab_assigned
+  def test_ab_assigned_object
     identity = { :a => :b }
     new_ab_test :foobar do
       alternatives "foo", "bar"
@@ -542,7 +542,7 @@ class AbTestTest < ActionController::TestCase
       identify { identity }
       metrics :coolness
     end
-    assert_equal nil, experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, identity)
+    assert_nil experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, identity)
     assert id = experiment(:foobar).choose.id
     assert_equal id, experiment(:foobar).playground.connection.ab_assigned(experiment(:foobar).id, identity)
   end

data/test/frameworks/rails/action_controller_test.rb

@@ -138,7 +138,8 @@ class UseVanityControllerTest < ActionController::TestCase
   end
 
   def test_vanity_identity_set_with_identity_paramater
-    get :index, :_identity => "id_from_params"
+    params = { :_identity => "id_from_params" }
+    get :index, params
     assert_equal "id_from_params", @controller.send(:vanity_identity)
   end
 
@@ -156,7 +157,8 @@ class UseVanityControllerTest < ActionController::TestCase
 
     def test_vanity_identity_prefers_parameter_over_cookie
     @request.cookies['vanity_id'] = "old_id"
-    get :index, :_identity => "id_from_params"
+    params = { :_identity => "id_from_params" }
+    get :index, params
     assert_equal "id_from_params", @controller.send(:vanity_identity)
     assert cookies['vanity_id'], "id_from_params"
   end
@@ -171,7 +173,8 @@ class UseVanityControllerTest < ActionController::TestCase
   # query parameter filter
 
   def test_redirects_and_loses_vanity_query_parameter
-    get :index, :foo=>"bar", :_vanity=>"567"
+    params = { :foo=>"bar", :_vanity=>"567" }
+    get :index, params
     assert_redirected_to "/use_vanity?foo=bar"
   end
 
@@ -180,7 +183,8 @@ class UseVanityControllerTest < ActionController::TestCase
     fingerprint = experiment(:pie_or_cake).fingerprint(first)
     10.times do
       @controller = nil ; setup_controller_request_and_response
-      get :index, :_vanity => fingerprint
+      params = { :_vanity => fingerprint }
+      get :index, params
       assert_equal experiment(:pie_or_cake).choose, experiment(:pie_or_cake).alternatives.first
       assert experiment(:pie_or_cake).showing?(first)
     end
@@ -190,13 +194,15 @@ class UseVanityControllerTest < ActionController::TestCase
     experiment(:pie_or_cake).chooses(experiment(:pie_or_cake).alternatives.last.value)
     first = experiment(:pie_or_cake).alternatives.first
     fingerprint = experiment(:pie_or_cake).fingerprint(first)
-    post :index, :foo => "bar", :_vanity => fingerprint
+    params = { :foo => "bar", :_vanity => fingerprint }
+    post :index, params
     assert_response :success
     assert !experiment(:pie_or_cake).showing?(first)
   end
 
   def test_track_param_tracks_a_metric
-    get :index, :_identity => "123", :_track => "sugar_high"
+    params = { :_identity => "123", :_track => "sugar_high" }
+    get :index, params
     assert_equal experiment(:pie_or_cake).alternatives[0].converted, 1
   end
 

data/test/frameworks/rails/action_mailer_test.rb

@@ -19,7 +19,6 @@ class UseVanityMailerTest < ActionMailer::TestCase
     experiment(:pie_or_cake).chooses(:pie)
     VanityMailer.ab_test_subject(nil)
 
-
     alts = experiment(:pie_or_cake).alternatives
     assert_equal 1, alts.map(&:participants).sum
   end

data/test/metric/active_record_test.rb

@@ -234,7 +234,13 @@ describe Vanity::Metric::ActiveRecord do
       f.write <<-RUBY
         metric "Sky is limit" do
           model Sky, :conditions=>["height > 3"]
-          Sky.after_save { |sky| Vanity.track!(:sky_is_limit) if sky.height_changed? && sky.height > 3 }
+          Sky.after_save do |sky|
+            if sky.respond_to?(:saved_change_to_height?) && sky.saved_change_to_height? && sky.height > 3
+              Vanity.track!(:sky_is_limit)
+            elsif sky.height_changed? && sky.height > 3
+              Vanity.track!(:sky_is_limit)
+            end
+          end
         end
       RUBY
     end
@@ -295,7 +301,7 @@ describe Vanity::Metric::ActiveRecord do
     File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
       f.write <<-RUBY
         metric "Sky is limit" do
-          Sky.after_save { |sky| Vanity.track!(:sky_is_limit) if sky.height_changed? && sky.height > 3 }
+          Sky.after_save { |sky| Vanity.track!(:sky_is_limit) if sky.height && sky.height > 3 }
         end
       RUBY
     end

data/test/test_helper.rb

@@ -20,7 +20,7 @@ require "rails/test_help"
 
 require "vanity"
 require "timecop"
-require "mocha/mini_test"
+require "mocha/minitest"
 require "fakefs/safe"
 require "webmock/minitest"
 
@@ -186,11 +186,53 @@ if defined?(ActiveSupport::TestCase)
 
     self.use_instantiated_fixtures = false if respond_to?(:use_instantiated_fixtures)
     self.use_transactional_fixtures = false if respond_to?(:use_transactional_fixtures)
+    self.use_transactional_tests = false if respond_to?(:use_transactional_tests)
+  end
+end
+
+# Shim for pre-5.0 tests
+module LegacyTestRequests
+  def rails4?
+    ActiveRecord::VERSION::MAJOR <= 4
+  end
+
+  def get(path, params={}, headers={})
+    if rails4?
+      process(path, 'GET', params, headers)
+    else
+      process(path, method: 'GET', params: params, **headers)
+    end
+  end
+
+  def post(path, params={}, headers={})
+    if rails4?
+      process(path, 'POST', params, headers)
+    else
+      process(path, method: 'POST', params: params, **headers)
+    end
+  end
+
+  def put(path, params={}, headers={})
+    if rails4?
+      process(path, 'PUT', params, headers)
+    else
+      process(path, method: 'PUT', params: params, **headers)
+    end
+  end
+
+  def delete(path, params={}, headers={})
+    if rails4?
+      process(path, 'DELETE', params, headers)
+    else
+      process(path, method: 'DELETE', params: params, **headers)
+    end
   end
 end
 
 if defined?(ActionController::TestCase)
   class ActionController::TestCase
+    include LegacyTestRequests
+
     alias :setup_controller_request_and_response_without_vanity :setup_controller_request_and_response
     # Sets Vanity.context to the current controller, so you can do things like:
     #   experiment(:simple).chooses(:green)
@@ -211,14 +253,19 @@ if ENV["DB"] == "active_record"
   ActiveRecord::Base.logger = $logger
 
   Vanity.connect!(VanityTestHelpers::DATABASE)
-  require "generators/templates/vanity_migration"
-  if defined?(ActiveRecord::Tasks)
-    config = Vanity::Adapters::ActiveRecordAdapter::VanityRecord.connection_config
-    ActiveRecord::Tasks::DatabaseTasks.drop(config.with_indifferent_access)
-  else # Rails 3.2 fallback
-    klasses = Vanity::Adapters::ActiveRecordAdapter::VanityRecord.descendants
-    klasses.each { |k| k.connection.drop_table(k.table_name) if k.connection.table_exists?(k.table_name) }
-  end
 
-  VanityMigration.new.migrate(:up)
+  config = Vanity::Adapters::ActiveRecordAdapter::VanityRecord.connection_config
+  ActiveRecord::Tasks::DatabaseTasks.drop(config.with_indifferent_access)
+
+  # use generator to create the migration
+  require "rails/generators"
+  require "generators/vanity/migration_generator"
+  Rails::Generators.invoke "vanity"
+
+  migrate_path = File.expand_path("../dummy/db/migrate/", __FILE__)
+  if defined?(ActiveRecord::MigrationContext)
+    ActiveRecord::MigrationContext.new(migrate_path).migrate
+  else
+    ActiveRecord::Migrator.migrate(migrate_path)
+  end
 end

data/test/web/rails/dashboard_test.rb

@@ -60,14 +60,16 @@ class RailsDashboardTest < ActionController::TestCase
   # --  Actions used in non-admin actions, e.g. in JS --
 
   def test_add_participant
-    xhr :post, :add_participant, :v => 'food=0'
+    params = { :v => 'food=0' }
+    post :add_participant, params, :xhr => true
     assert_response :success
     assert @response.body.blank?
     assert_equal 1, experiment(:food).alternatives.map(&:participants).sum
   end
 
   def test_add_participant_multiple_experiments
-    xhr :post, :add_participant, :v => 'food=0,drink=1'
+    params = { :v => 'food=0,drink=1' }
+    post :add_participant, params, :xhr => true
     assert_response :success
     assert @response.body.blank?
     assert_equal 1, experiment(:food).alternatives.map(&:participants).sum
@@ -76,18 +78,20 @@ class RailsDashboardTest < ActionController::TestCase
 
   def test_add_participant_with_invalid_request
     @request.user_agent = 'Googlebot/2.1 ( http://www.google.com/bot.html)'
-    xhr :post, :add_participant, :v => 'food=0'
+    params = { :v => 'food=0' }
+    post :add_participant, params, :xhr => true
     assert_equal 0, experiment(:food).alternatives.map(&:participants).sum
   end
 
   def test_add_participant_no_params
-    xhr :post, :add_participant
+    post :add_participant, :xhr => true
     assert_response :not_found
     assert @response.body.blank?
   end
 
   def test_add_participant_not_fail_for_unknown_experiment
-    xhr :post, :add_participant, :e => 'unknown=0'
+    params = { :e => 'unknown=0' }
+    post :add_participant, params, :xhr => true
     assert_response :not_found
     assert @response.body.blank?
   end
@@ -96,13 +100,15 @@ class RailsDashboardTest < ActionController::TestCase
 
   def test_participant_renders_experiment_for_id
     experiment(:food).choose
-    get :participant, :id => "1"
+    params = { :id => "1" }
+    get :participant, params
     assert_response :success
     assert @response.body =~ %r{id 1 is taking part in the following experiments:\n<ul class=\"experiments\">[\s]+<li class=\"experiment ab_test}
   end
 
   def test_participant_renders_empty_for_bad_id
-    get :participant, :id => "2"
+    params = { :id => "2" }
+    get :participant, params
     assert_response :success
     assert @response.body =~ %r{<ul class=\"experiments\">[\s]+</ul>}
   end
@@ -114,19 +120,22 @@ class RailsDashboardTest < ActionController::TestCase
   end
 
   def test_complete_forces_confirmation
-    xhr :post, :complete, :e => "food", :a => 0
+    params = { :e => "food", :a => 0 }
+    post :complete, params, :xhr => true
     assert_response :success
     assert @response.body =~ /#{ CGI.unescape({ :confirmed => 0 }.to_query) }/
   end
 
   def test_complete_with_confirmation_completes
-    xhr :post, :complete, :e => "food", :a => 0, :confirmed => 'true'
+    params = { :e => "food", :a => 0, :confirmed => 'true' }
+    post :complete, params, :xhr => true
     assert_response :success
     assert !Vanity.playground.experiment(:food).active?
   end
 
   def test_chooses
-    xhr :post, :chooses, :e => "food", :a => 0
+    params = { :e => "food", :a => 0 }
+    post :chooses, params, :xhr => true
     assert_response :success
   end
 end