vanity 3.0.2 → 4.0.1

data/test/experiment/base_test.rb

@@ -1,7 +1,6 @@
 require "test_helper"
 
 describe Vanity::Experiment::Base do
-
   before do
     metric "Happiness"
   end
@@ -9,28 +8,28 @@ describe Vanity::Experiment::Base do
   # -- Defining experiment --
 
   it "can access experiment by id" do
-    exp = new_ab_test(:ice_cream_flavor) { metrics :happiness; default false }
+    exp = new_ab_test(:ice_cream_flavor) do
+      metrics :happiness
+      default false
+    end
     assert_equal exp, experiment(:ice_cream_flavor)
   end
 
   it "fails when defining same experiment twice" do
-    File.open "tmp/experiments/ice_cream_flavor.rb", "w" do |f|
-      f.write <<-RUBY
+    File.write("tmp/experiments/ice_cream_flavor.rb", <<-RUBY)
         ab_test "Ice Cream Flavor" do
           default false
         end
         ab_test "Ice Cream Flavor" do
           default false
         end
-      RUBY
-    end
+    RUBY
     Vanity.unload!
     assert_raises NameError do
       experiment(:ice_cream_flavor)
     end
   end
 
-
   # -- Loading experiments --
 
   it "fails if cannot load named experiment" do
@@ -40,24 +39,20 @@ describe Vanity::Experiment::Base do
   end
 
   it "loads the experiment" do
-    File.open "tmp/experiments/ice_cream_flavor.rb", "w" do |f|
-      f.write <<-RUBY
+    File.write("tmp/experiments/ice_cream_flavor.rb", <<-RUBY)
         ab_test "Ice Cream Flavor" do
           def xmts
             "x"
           end
           default false
         end
-      RUBY
-    end
+    RUBY
     Vanity.unload!
     assert_equal "x", experiment(:ice_cream_flavor).xmts
   end
 
   it "fails if error loading experiment" do
-    File.open "tmp/experiments/ice_cream_flavor.rb", "w" do |f|
-      f.write "fail 'yawn!'"
-    end
+    File.write("tmp/experiments/ice_cream_flavor.rb", "fail 'yawn!'")
     Vanity.unload!
     assert_raises NameError do
       experiment(:ice_cream_flavor)
@@ -65,9 +60,7 @@ describe Vanity::Experiment::Base do
   end
 
   it "complains if not defined where expected" do
-    File.open "tmp/experiments/ice_cream_flavor.rb", "w" do |f|
-      f.write ""
-    end
+    File.write("tmp/experiments/ice_cream_flavor.rb", "")
     Vanity.unload!
     assert_raises NameError do
       experiment(:ice_cream_flavor)
@@ -75,37 +68,46 @@ describe Vanity::Experiment::Base do
   end
 
   it "reloading experiments" do
-    new_ab_test(:ab) { metrics :happiness; default false }
-    new_ab_test(:cd) { metrics :happiness; default false }
+    new_ab_test(:ab) do
+      metrics :happiness
+      default false
+    end
+    new_ab_test(:cd) do
+      metrics :happiness
+      default false
+    end
     assert_equal 2, Vanity.playground.experiments.size
     Vanity.playground.reload!
     assert Vanity.playground.experiments.empty?
   end
 
-
   # -- Attributes --
 
   it "maps the experiment name to id" do
-    experiment = new_ab_test("Ice Cream Flavor/Tastes") { metrics :happiness; default false }
+    experiment = new_ab_test("Ice Cream Flavor/Tastes") do
+      metrics :happiness
+      default false
+    end
     assert_equal "Ice Cream Flavor/Tastes", experiment.name
     assert_equal :ice_cream_flavor_tastes, experiment.id
   end
 
   it "saves the experiment after definition" do
-    File.open "tmp/experiments/ice_cream_flavor.rb", "w" do |f|
-      f.write <<-RUBY
+    File.write("tmp/experiments/ice_cream_flavor.rb", <<-RUBY)
         ab_test "Ice Cream Flavor" do
           default false
         end
-      RUBY
-    end
+    RUBY
     Vanity.unload!
     metric :happiness
     Vanity.playground.experiment(:ice_cream_flavor)
   end
 
   it "has created timestamp" do
-    new_ab_test(:ice_cream_flavor) { metrics :happiness; default false }
+    new_ab_test(:ice_cream_flavor) do
+      metrics :happiness
+      default false
+    end
     assert_kind_of Time, experiment(:ice_cream_flavor).created_at
     assert_in_delta experiment(:ice_cream_flavor).created_at.to_i, Time.now.to_i, 1
   end
@@ -113,12 +115,18 @@ describe Vanity::Experiment::Base do
   it "keeps created timestamp across definitions" do
     past = Date.today - 1
     Timecop.freeze past.to_time do
-      new_ab_test(:ice_cream_flavor) { metrics :happiness; default false }
+      new_ab_test(:ice_cream_flavor) do
+        metrics :happiness
+        default false
+      end
     end
 
     vanity_reset
     metric :happiness
-    new_ab_test(:ice_cream_flavor) { metrics :happiness; default false }
+    new_ab_test(:ice_cream_flavor) do
+      metrics :happiness
+      default false
+    end
     assert_equal past.to_time.to_i, experiment(:ice_cream_flavor).created_at.to_i
   end
 
@@ -133,7 +141,10 @@ describe Vanity::Experiment::Base do
 
   it "stores nothing when collection disabled" do
     not_collecting!
-    new_ab_test(:ice_cream_flavor) { metrics :happiness; default false }
+    new_ab_test(:ice_cream_flavor) do
+      metrics :happiness
+      default false
+    end
     experiment(:ice_cream_flavor).complete!
   end
 
@@ -142,7 +153,10 @@ describe Vanity::Experiment::Base do
   # check_completion is called by derived classes, but since it's
   # part of the base_test I'm testing it here.
   it "handles error in check completion" do
-    new_ab_test(:ab) { metrics :happiness; default false }
+    new_ab_test(:ab) do
+      metrics :happiness
+      default false
+    end
     e = experiment(:ab)
     e.complete_if { true }
     e.stubs(:complete!).raises(RuntimeError, "A forced error")
@@ -152,7 +166,10 @@ describe Vanity::Experiment::Base do
   end
 
   it "complete updates completed_at" do
-    new_ab_test(:ice_cream_flavor) { metrics :happiness; default false }
+    new_ab_test(:ice_cream_flavor) do
+      metrics :happiness
+      default false
+    end
 
     time = Time.utc(2008, 9, 1, 12, 0, 0)
     Timecop.freeze(time) do
@@ -160,5 +177,4 @@ describe Vanity::Experiment::Base do
     end
     assert_equal time, experiment(:ice_cream_flavor).completed_at
   end
-
 end

data/test/frameworks/rails/action_controller_test.rb

@@ -19,9 +19,7 @@ class UseVanityControllerTest < ActionController::TestCase
     end
 
     # Rails 3 configuration for cookies
-    if ::Rails.respond_to?(:application)
-      ::Rails.application.config.session_options[:domain] = '.foo.bar'
-    end
+    ::Rails.application.config.session_options[:domain] = '.foo.bar' if ::Rails.respond_to?(:application)
   end
 
   def teardown
@@ -31,25 +29,25 @@ class UseVanityControllerTest < ActionController::TestCase
   def test_render_js_for_tests
     Vanity.playground.use_js!
     get :js
-    assert_match /script.*v=pie_or_cake=.*script/m, @response.body
+    assert_match(/script.*v=pie_or_cake=.*script/m, @response.body)
   end
 
   def test_view_helper_ab_test_js_for_tests
     Vanity.playground.use_js!
     get :view_helper_ab_test_js
-    assert_match /script.*v=pie_or_cake=.*script/m, @response.body
+    assert_match(/script.*v=pie_or_cake=.*script/m, @response.body)
   end
 
   def test_global_ab_test_js_for_tests
     Vanity.playground.use_js!
     get :global_ab_test_js
-    assert_match /script.*v=pie_or_cake=.*script/m, @response.body
+    assert_match(/script.*v=pie_or_cake=.*script/m, @response.body)
   end
 
   def test_render_model_js_for_tests
     Vanity.playground.use_js!
     get :model_js
-    assert_match /script.*v=pie_or_cake=.*script/m, @response.body
+    assert_match(/script.*v=pie_or_cake=.*script/m, @response.body)
   end
 
   def test_chooses_sets_alternatives_for_rails_tests
@@ -77,10 +75,10 @@ class UseVanityControllerTest < ActionController::TestCase
   def test_vanity_cookie_is_persistent
     get :index
     cookie = @response["Set-Cookie"].to_s
-    assert_match /vanity_id=[a-f0-9]{32};/, cookie
+    assert_match(/vanity_id=[a-f0-9]{32};/, cookie)
     expires = cookie[/expires=(.*)(;|$)/, 1]
     assert expires
-    assert_in_delta Time.parse(expires), Time.now + 20 * 365 * 24 * 60 * 60, 1.day
+    assert_in_delta Time.parse(expires), Time.now + (20 * 365 * 24 * 60 * 60), 1.day
   end
 
   def test_vanity_cookie_default_id
@@ -91,7 +89,7 @@ class UseVanityControllerTest < ActionController::TestCase
   def test_vanity_cookie_retains_id
     @request.cookies["vanity_id"] = "from_last_time"
     get :index
-    assert_equal "from_last_time",  cookies["vanity_id"]
+    assert_equal "from_last_time", cookies["vanity_id"]
   end
 
   def test_vanity_cookie_uses_configuration
@@ -107,13 +105,13 @@ class UseVanityControllerTest < ActionController::TestCase
   end
 
   def test_vanity_identity_set_from_user
-    @controller.current_user = stub("user", :id=>"user_id")
+    @controller.current_user = stub("user", id: "user_id")
     get :index
     assert_equal "user_id", @controller.send(:vanity_identity)
   end
 
   def test_vanity_identity_with_null_user_falls_back_to_cookie
-    @controller.current_user = stub("user", :id=>nil)
+    @controller.current_user = stub("user", id: nil)
     get :index
     assert cookies["vanity_id"] =~ /^[a-f0-9]{32}$/
   end
@@ -130,6 +128,7 @@ class UseVanityControllerTest < ActionController::TestCase
   def test_vanity_identity_set_with_block
     UseVanityController.class_eval do
       attr_accessor :project_id
+
       use_vanity { |controller| controller.project_id }
     end
     @controller.project_id = "576"
@@ -138,26 +137,27 @@ class UseVanityControllerTest < ActionController::TestCase
   end
 
   def test_vanity_identity_set_with_identity_paramater
-    params = { :_identity => "id_from_params" }
+    params = { _identity: "id_from_params" }
     get :index, params
     assert_equal "id_from_params", @controller.send(:vanity_identity)
   end
 
   def test_vanity_identity_prefers_block_over_symbol
     UseVanityController.class_eval do
-      attr_accessor :project_id
+      attr_accessor :project_id # rubocop:todo Lint/DuplicateMethods
+
       use_vanity(:current_user) { |controller| controller.project_id }
     end
     @controller.project_id = "576"
-    @controller.current_user = stub(:id=>"user_id")
+    @controller.current_user = stub(id: "user_id")
 
     get :index
     assert_equal "576", @controller.send(:vanity_identity)
   end
 
-    def test_vanity_identity_prefers_parameter_over_cookie
+  def test_vanity_identity_prefers_parameter_over_cookie
     @request.cookies['vanity_id'] = "old_id"
-    params = { :_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"
@@ -165,7 +165,7 @@ class UseVanityControllerTest < ActionController::TestCase
 
   def test_vanity_identity_prefers_cookie_over_object
     @request.cookies['vanity_id'] = "from_last_time"
-    @controller.current_user = stub(:id=>"user_id")
+    @controller.current_user = stub(id: "user_id")
     get :index
     assert_equal "from_last_time", @controller.send(:vanity_identity)
   end
@@ -173,7 +173,7 @@ class UseVanityControllerTest < ActionController::TestCase
   # query parameter filter
 
   def test_redirects_and_loses_vanity_query_parameter
-    params = { :foo=>"bar", :_vanity=>"567" }
+    params = { foo: "bar", _vanity: "567" }
     get :index, params
     assert_redirected_to "/use_vanity?foo=bar"
   end
@@ -182,8 +182,9 @@ class UseVanityControllerTest < ActionController::TestCase
     first = experiment(:pie_or_cake).alternatives.first
     fingerprint = experiment(:pie_or_cake).fingerprint(first)
     10.times do
-      @controller = nil ; setup_controller_request_and_response
-      params = { :_vanity => fingerprint }
+      @controller = nil
+      setup_controller_request_and_response
+      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)
@@ -194,21 +195,20 @@ 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)
-    params = { :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
-    params = { :_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
 
   def test_cookie_domain_from_rails_configuration
     get :index
-    assert_match /domain=.foo.bar/, @response["Set-Cookie"] if ::Rails.respond_to?(:application)
+    assert_match(/domain=.foo.bar/, @response["Set-Cookie"]) if ::Rails.respond_to?(:application)
   end
-
 end

data/test/frameworks/rails/action_mailer_test.rb

@@ -15,7 +15,7 @@ class UseVanityMailerTest < ActionMailer::TestCase
 
   def test_js_enabled_still_adds_participant
     Vanity.playground.use_js!
-    experiment(:pie_or_cake).identify { }
+    experiment(:pie_or_cake).identify {} # rubocop:todo Lint/EmptyBlock
     experiment(:pie_or_cake).chooses(:pie)
     VanityMailer.ab_test_subject(nil)
 
@@ -24,7 +24,7 @@ class UseVanityMailerTest < ActionMailer::TestCase
   end
 
   def test_returns_different_alternatives
-    experiment(:pie_or_cake).identify { }
+    experiment(:pie_or_cake).identify {} # rubocop:todo Lint/EmptyBlock
 
     experiment(:pie_or_cake).chooses(:pie)
     email = VanityMailer.ab_test_subject(nil)

data/test/frameworks/rails/action_view_test.rb

@@ -34,13 +34,13 @@ class RailsHelperTest < ActionView::TestCase
   end
 
   def test_vanity_track_url_for_returns_url_with_identity_and_metrics
-    self.expects(:url_for).with(:controller => "controller", :action => "action", :_identity => '123', :_track => :sugar_high)
-    vanity_track_url_for("123", :sugar_high, :controller => "controller", :action => "action")
+    expects(:url_for).with(controller: "controller", action: "action", _identity: '123', _track: :sugar_high)
+    vanity_track_url_for("123", :sugar_high, controller: "controller", action: "action")
   end
 
   def test_vanity_tracking_image
-    self.expects(:url_for).with(:controller => :vanity, :action => :image, :_identity => '123', :_track => :sugar_high).returns("/url")
-    assert_equal image_tag("/url", :width => "1px", :height => "1px", :alt => ""), vanity_tracking_image("123", :sugar_high, options = {})
+    expects(:url_for).with(controller: :vanity, action: :image, _identity: '123', _track: :sugar_high).returns("/url")
+    assert_equal image_tag("/url", width: "1px", height: "1px", alt: ""), vanity_tracking_image("123", :sugar_high, options = {}) # rubocop:todo Lint/UselessAssignment
   end
 
   def test_vanity_experiments
@@ -53,7 +53,7 @@ class RailsHelperTest < ActionView::TestCase
   end
 
   def test_vanity_experiments_return_is_read_only
-    result = ab_test(:pie_or_cake)
+    result = ab_test(:pie_or_cake) # rubocop:todo Lint/UselessAssignment
     vanity_experiments_returns = vanity_experiments
     vanity_experiments_returns[:some_new_key] = 'some new value'
     assert_equal vanity_experiments.keys.length, 1
@@ -62,5 +62,4 @@ class RailsHelperTest < ActionView::TestCase
   def test_vanity_experiments_returns_empty_hash_when_no_experiments
     assert_equal vanity_experiments, {}
   end
-
 end