magic_lamp 1.3.0 → 1.3.1

data/spec/dummy/spec/magical/magic_lamp_config.rb

@@ -1 +1 @@
-MagicLamp.registered_fixtures
+MagicLamp.registered?("spec")

data/spec/dummy/test/magic_lamp_config.rb

@@ -0,0 +1 @@
+MagicLamp.registered?("test")

data/spec/dummy/test/test_lamp.rb

@@ -0,0 +1,3 @@
+MagicLamp.fixture(name: "from_test_directory") do
+  render text: ""
+end

data/spec/javascripts/genie_spec.js

@@ -151,6 +151,7 @@ describe('Genie', function() {
     it('requests all of the fixtures and puts them in the cache', function() {
       subject.preload();
       expect(subject.cache).to.have.keys([
+        'from_test_directory',
         'orders/foo',
         'orders/bar',
         'orders/form',

data/spec/lib/magic_lamp_spec.rb

@@ -229,8 +229,9 @@ describe MagicLamp do
   end
 
   describe "#load_config" do
-    it "loads the magic lamp config file" do
-      expect(subject).to receive(:registered_fixtures)
+    it "loads the magic lamp config file from the spec and test directories" do
+      expect(subject).to receive(:registered?).with("spec")
+      expect(subject).to receive(:registered?).with("test")
       subject.load_config
     end
 
@@ -242,11 +243,16 @@ describe MagicLamp do
   end
 
   describe "#load_lamp_files" do
-    it "loads all lamp files" do
+    it "loads all lamp files from the spec directory" do
       subject.load_lamp_files
       expect(subject.registered_fixtures["orders/foo"]).to be_a(Hash)
     end
 
+    it "loads all lamp files from the test directory" do
+      subject.load_lamp_files
+      expect(subject.registered_fixtures["from_test_directory"]).to be_a(Hash)
+    end
+
     it "blows out registered_fixtures on each call" do
       old_registry = subject.registered_fixtures
       subject.load_lamp_files
@@ -327,23 +333,4 @@ describe MagicLamp do
       expect(form_fixture).to match(/<div class="actions"/)
     end
   end
-
-  describe "#path" do
-    context "spec directory" do
-      let(:spec_path) { Rails.root.join("spec") }
-
-      it "returns a default path starting from spec" do
-        expect(subject.path).to eq(spec_path)
-      end
-    end
-
-    context "no spec directory" do
-      let(:test_path) { Rails.root.join("test") }
-
-      it "returns a default path starting from test" do
-        allow(Dir).to receive(:exist?).and_return(false)
-        expect(subject.path).to eq(test_path)
-      end
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_lamp
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Michael Crismali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -281,6 +281,8 @@ files:
 - spec/dummy/spec/magical/a_lamp_file_with_a_different_name_lamp.rb
 - spec/dummy/spec/magical/magic_lamp.rb
 - spec/dummy/spec/magical/magic_lamp_config.rb
+- spec/dummy/test/magic_lamp_config.rb
+- spec/dummy/test/test_lamp.rb
 - spec/dummy/tmp/cache/assets/development/sprockets/020414588350dc7f6c910d23b47b2eac
 - spec/dummy/tmp/cache/assets/development/sprockets/04a1e26a9e3fde1f448cb2a9d382fbbc
 - spec/dummy/tmp/cache/assets/development/sprockets/05ecd34d23e110728a2f04ad35ec8834
@@ -411,7 +413,7 @@ files:
 - spec/teaspoon_env.rb
 homepage: https://github.com/crismali/magic_lamp
 licenses:
-- Apache
+- Apache 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -490,6 +492,8 @@ test_files:
 - spec/dummy/spec/magical/a_lamp_file_with_a_different_name_lamp.rb
 - spec/dummy/spec/magical/magic_lamp.rb
 - spec/dummy/spec/magical/magic_lamp_config.rb
+- spec/dummy/test/magic_lamp_config.rb
+- spec/dummy/test/test_lamp.rb
 - spec/dummy/tmp/cache/assets/development/sprockets/020414588350dc7f6c910d23b47b2eac
 - spec/dummy/tmp/cache/assets/development/sprockets/04a1e26a9e3fde1f448cb2a9d382fbbc
 - spec/dummy/tmp/cache/assets/development/sprockets/05ecd34d23e110728a2f04ad35ec8834