spec/gon/global_spec.rb in gon-4.1.1 vs spec/gon/global_spec.rb in gon-5.0.0

@@ -12,22 +12,22 @@
     it 'returns all variables in hash' do
       Gon.global.a = 1
       Gon.global.b = 2
       Gon.global.c = Gon.global.a + Gon.global.b
       Gon.global.c.should == 3
-      Gon.global.all_variables.should == {'a' => 1, 'b' => 2, 'c' => 3}
+      Gon.global.all_variables.should == { 'a' => 1, 'b' => 2, 'c' => 3 }
     end
 
     it 'supports all data types' do
       Gon.global.clear
-      Gon.global.int = 1
-      Gon.global.float = 1.1
-      Gon.global.string = 'string'
-      Gon.global.array = [ 1, 'string' ]
-      Gon.global.hash_var = { :a => 1, :b => '2'}
-      Gon.global.hash_w_array = { :a => [ 2, 3 ] }
-      Gon.global.klass = Hash
+      Gon.global.int          = 1
+      Gon.global.float        = 1.1
+      Gon.global.string       = 'string'
+      Gon.global.array        = [1, 'string']
+      Gon.global.hash_var     = { :a => 1, :b => '2' }
+      Gon.global.hash_w_array = { :a => [2, 3] }
+      Gon.global.klass        = Hash
     end
 
   end
 
   describe '#include_gon' do
@@ -45,56 +45,53 @@
 
     it 'outputs correct js with an integer' do
       Gon.global.int = 1
       @base.include_gon.should == "<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
-                                    "window.gon = {};" +
+                                    "window.gon={};" +
                                     "gon.global={\"int\":1};" +
                                     "\n//]]>\n" +
                                   "</script>"
     end
 
     it 'outputs correct js with an integer and integer in Gon' do
-      Gon::Request.
-        instance_variable_set(:@request_id, request.object_id)
-      Gon::Request.env = {}
       Gon.int = 1
       Gon.global.int = 1
       @base.include_gon.should == "<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
-                                    "window.gon = {};" +
+                                    "window.gon={};" +
                                     "gon.int=1;" +
                                     "gon.global={\"int\":1};" +
                                     "\n//]]>\n" +
                                   "</script>"
     end
 
     it 'outputs correct js with a string' do
       Gon.global.str = %q(a'b"c)
       @base.include_gon.should == "<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
-                                    "window.gon = {};" +
+                                    "window.gon={};" +
                                     "gon.global={\"str\":\"a'b\\\"c\"};" +
                                     "\n//]]>\n" +
                                   "</script>"
     end
 
     it 'outputs correct js with a script string' do
       Gon.global.str = %q(</script><script>alert('!')</script>)
       @base.include_gon.should == "<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
-                                    "window.gon = {};" +
+                                    "window.gon={};" +
                                     "gon.global={\"str\":\"\\u003C/script><script>alert('!')\\u003C/script>\"};" +
                                     "\n//]]>\n" +
                                   "</script>"
     end
 
     it 'outputs correct js with a unicode line separator' do
       Gon.global.str = "\u2028"
       @base.include_gon.should == "<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
-                                    "window.gon = {};" +
+                                    "window.gon={};" +
                                     "gon.global={\"str\":\"&#x2028;\"};" +
                                     "\n//]]>\n" +
                                   "</script>"
     end
 
@@ -112,18 +109,18 @@
       Gon.global.clear
       controller.instance_variable_set('@objects', objects)
     end
 
     let(:controller) { ActionController::Base.new }
-    let(:objects) { [1,2] }
+    let(:objects) { [1, 2] }
 
     it 'works fine with rabl' do
-      Gon.global.rabl :template =>'spec/test_data/sample.rabl', :controller => controller
+      Gon.global.rabl :template => 'spec/test_data/sample.rabl', :controller => controller
       Gon.global.objects.length.should == 2
     end
 
     it 'works fine with jbuilder' do
-      Gon.global.jbuilder :template =>'spec/test_data/sample.json.jbuilder', :controller => controller
+      Gon.global.jbuilder :template => 'spec/test_data/sample.json.jbuilder', :controller => controller
       Gon.global.objects.length.should == 2
     end
 
     it 'should throw exception, if use rabl or jbuilder without :template' do
       lambda { Gon.global.rabl }.should raise_error