Fix AbPanel::Javascript if no properties are set

Author: bittersweet

lib/ab_panel.rb

@@ -37,6 +37,10 @@ def scenarios(experiment)
       config.scenarios experiment
     end
 
+    def properties
+      @env[:properties]
+    end
+
     def env
       @env ||= {
         'conditions' => conditions

lib/ab_panel/javascript.rb

@@ -1,9 +1,8 @@
 module AbPanel
   class Javascript
     def self.environment
-      props = {
-        distinct_id: AbPanel.env["distinct_id"]
-      }.merge(AbPanel.env[:properties])
+      props = { distinct_id: AbPanel.env["distinct_id"] }
+      props.merge!(AbPanel.properties) if AbPanel.properties
 
       AbPanel.funnels.each { |f| props["funnel_#{f}"] = true }
 

spec/ab_panel/javascript_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe AbPanel::Javascript do
+  it 'returns json of all relevant properties, funnels and experiments' do
+    AbPanel.set_env('distinct_id', 'distinct_id')
+    AbPanel.set_env(:properties, { post_name: 'test' })
+    result = JSON.parse(AbPanel::Javascript.environment)
+    result['distinct_id'].should == 'distinct_id'
+  end
+
+  it 'works without extra properties' do
+    AbPanel.set_env(:properties, nil)
+    result = JSON.parse(AbPanel::Javascript.environment)
+    result['distinct_id'].should == 'distinct_id'
+  end
+end