magic_lamp 1.4.0 → 1.4.1

data/spec/dummy/spec/magical/magic_lamp.rb

@@ -15,6 +15,10 @@ MagicLamp.fixture(name: "hash_to_jsoned") do
   { foo: "bar" }
 end
 
+MagicLamp.fixture(name: "rendered_json") do
+  render json: { foo: "baz" }
+end
+
 MagicLamp.fixture(name: "just_some_string") do
   "I'm a super awesome string"
 end

data/spec/javascripts/genie_spec.js

@@ -153,6 +153,7 @@ describe('Genie', function() {
       expect(subject.cache).to.have.keys([
         'from_test_directory',
         'hash_to_jsoned',
+        'rendered_json',
         'just_some_string',
         'orders/foo',
         'orders/bar',
@@ -306,7 +307,15 @@ describe('Genie', function() {
       stub(subject, 'handleError', true);
       stub(subject, 'xhrStatus', 500);
       var path = '/magic_lamp/foo/bar';
-      var xhr = subject.xhrRequest(path);
+      subject.xhrRequest(path);
+      expect(subject.handleError).to.have.been.calledWith('Something went wrong, please check the server log or run `rake magic_lamp:lint` for more information');
+    });
+
+    it('calls handleError with the default error message if the status was 404', function() {
+      stub(subject, 'handleError', true);
+      stub(subject, 'xhrStatus', 404);
+      var path = '/magic_lamp/foo/bar';
+      subject.xhrRequest(path);
       expect(subject.handleError).to.have.been.calledWith('Something went wrong, please check the server log or run `rake magic_lamp:lint` for more information');
     });
   });

data/spec/javascripts/magic_lamp_spec.js

@@ -282,5 +282,10 @@ describe('MagicLamp', function() {
       var string = subject.loadRaw('just_some_string');
       expect(string).to.equal("I'm a super awesome string");
     });
+
+    it('can load rendered json', function() {
+      var json = subject.loadJSON('rendered_json');
+      expect(json).to.be.like({ foo: 'baz' })
+    });
   });
 });

data/spec/lib/fixture_creator_spec.rb

@@ -35,6 +35,30 @@ describe MagicLamp::FixtureCreator do
           render :foo
         end
       end
+
+      context "render json (non string)" do
+        let!(:rendered) do
+          subject.generate_template(OrdersController, []) do
+            render json: { foo: :bar }
+          end
+        end
+
+        it "renders json passed to render" do
+          expect(rendered).to eq({ foo: :bar }.to_json)
+        end
+      end
+
+      context "render json (string)" do
+        let!(:rendered) do
+          subject.generate_template(OrdersController, []) do
+            render json: "woohoo!"
+          end
+        end
+
+        it "renders json passed to render" do
+          expect(rendered).to eq("woohoo!")
+        end
+      end
     end
 
     context "render not called" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_lamp
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Michael Crismali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -394,7 +394,6 @@ files:
 - spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
 - spec/dummy/tmp/cache/assets/test/sprockets/e4468469b981ba614a29626880137332
 - spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
-- spec/dummy/tmp/pids/server.pid
 - spec/javascripts/genie_spec.js
 - spec/javascripts/magic_lamp_spec.js
 - spec/javascripts/spec_helper.js
@@ -606,7 +605,6 @@ test_files:
 - spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
 - spec/dummy/tmp/cache/assets/test/sprockets/e4468469b981ba614a29626880137332
 - spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
-- spec/dummy/tmp/pids/server.pid
 - spec/javascripts/genie_spec.js
 - spec/javascripts/magic_lamp_spec.js
 - spec/javascripts/spec_helper.js

data/spec/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-89870