spec/unit/puppet-herald/javascript_spec.rb in puppet-herald-0.1.1 vs spec/unit/puppet-herald/javascript_spec.rb in puppet-herald-0.2.0

@@ -1,42 +1,37 @@
 require 'spec_helper'
 require 'puppet-herald'
 require 'puppet-herald/javascript'
 
 describe PuppetHerald::Javascript, '.files' do
+  subject { PuppetHerald::Javascript.new }
   context 'running in dev environment' do
     before :each do
-      expect(PuppetHerald).to receive(:is_in_dev?).twice.and_return true
+      expect(PuppetHerald).to receive(:in_dev?).twice.and_return true
       expect(Dir).to receive(:glob).twice.and_return(['aaa.js', 'a/bbb.js', 'ccc_test.js'])
-      PuppetHerald::Javascript::files
+      subject.files
     end
-    after :each do
-      PuppetHerald::Javascript::class_variable_set '@@files', nil
-    end
-    let(:files) { PuppetHerald::Javascript::files }
+    let(:files) { subject.files }
     it { files.size.should eq 2 }
     it { files.should include 'aaa.js' }
     it { files.should_not include 'ccc_test.js' }
   end
 
   context 'running in prod environment' do
     before :each do
-      expect(PuppetHerald).to receive(:is_in_dev?).twice.and_return false
+      expect(PuppetHerald).to receive(:in_dev?).twice.and_return false
       expect(Dir).to receive(:glob).once.and_return(['aaa.js', 'a/bbb.js', 'ccc_test.js'])
-      PuppetHerald::Javascript::files
+      subject.files
     end
-    after :each do
-      PuppetHerald::Javascript::class_variable_set '@@files', nil
-    end
-    let(:files) { PuppetHerald::Javascript::files }
+    let(:files) { subject.files }
     it { files.size.should eq 2 }
     it { files.should include 'aaa.js' }
     it { files.should_not include 'ccc_test.js' }
   end
 end
 
 describe PuppetHerald::Javascript, '.uglify' do
-  subject { PuppetHerald::Javascript::uglify 'myapp.js.map' }
+  subject { PuppetHerald::Javascript.new.uglify 'myapp.js.map' }
 
   it { subject.size.should eq 2 }
   it { subject['js'].should_not be_empty }
   it { subject['js.map'].should_not be_empty }
   it { subject['js'].should include('myapp.js.map') }
\ No newline at end of file