spec/lib/generator_spec.rb in picky-0.0.8 vs spec/lib/generator_spec.rb in picky-0.0.9

@@ -54,10 +54,16 @@
       it "should have a name" do
         @generator.name.should == 'some_name'
       end
     end
     
+    describe "prototype_project_basedir" do
+      it "should be the right basedir" do
+        @generator.prototype_project_basedir.should == File.expand_path('../../../prototype_project', __FILE__)
+      end
+    end
+    
     describe "generate" do
       it "should do things in order" do
         @generator.should_receive(:create_target_directory).once.ordered
         @generator.should_receive(:copy_all_files).once.ordered
         
@@ -107,11 +113,11 @@
     
     describe "target_filename_for" do
       it "should return the right filename" do
         @generator.stub! :target_directory => 'some_target_directory'
         
-        test_filename = File.expand_path File.join(@generator.prototype_project_basedir, '/some/file/name')
+        test_filename = File.expand_path 'some/file/name', @generator.prototype_project_basedir
         
         @generator.target_filename_for(test_filename).should == 'some_target_directory/some/file/name'
       end
     end
     
@@ -124,10 +130,10 @@
       end
     end
     
     describe "target_directory" do
       it "should return the right dir name" do
-        @generator.target_directory.should == File.expand_path(File.join(__FILE__, '..', '..', '..', 'some_name'))
+        @generator.target_directory.should == File.expand_path('../../../some_name', __FILE__)
       end
     end
     
   end
   
\ No newline at end of file