Add better test file management, and safer writes

avalonmediasystem · Nov 18, 2015 · cdf0205 · cdf0205
1 parent 0ff8320
commit cdf0205
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/lib/avalon/controlled_vocabulary.rb b/lib/avalon/controlled_vocabulary.rb
@@ -30,7 +30,7 @@ def self.vocabulary
     # @param [Hash] vocabulary The new vocabulary to save
     # @returns [Hash, false] The newly saved vocabulary, or false if save unable to obtain lock
     def self.vocabulary= vocabulary
-      f = File.open(@@path, File::RDWR|File::CREAT, 0644)
+      f = File.open(@@path, File::RDWR|File::TRUNC|File::CREAT, 0644)
       if f.flock(File::LOCK_NB|File::LOCK_EX)
         YAML.dump(vocabulary, f)
         f.flock(File::LOCK_UN)

diff --git a/spec/controllers/vocabulary_controller_spec.rb b/spec/controllers/vocabulary_controller_spec.rb
@@ -13,12 +13,19 @@
 # ---  END LICENSE_HEADER BLOCK  ---
 
 require 'spec_helper'
+require 'fileutils'
 
 describe VocabularyController, type: :controller do
   render_views
 
-  before(:each) { Avalon::ControlledVocabulary.class_variable_set :@@path, Rails.root.join('spec/fixtures/controlled_vocabulary.yml') }
-
+  before(:all) {
+    FileUtils.cp_r 'spec/fixtures/controlled_vocabulary.yml', 'spec/fixtures/controlled_vocabulary.yml.tmp'
+    Avalon::ControlledVocabulary.class_variable_set :@@path, Rails.root.join('spec/fixtures/controlled_vocabulary.yml.tmp') 
+  }
+  after(:all) {
+    File.delete('spec/fixtures/controlled_vocabulary.yml.tmp')
+  }
+
   describe "#index" do
     it "should return vocabulary for entire app" do
       get 'index'

diff --git a/spec/fixtures/controlled_vocabulary.yml b/spec/fixtures/controlled_vocabulary.yml
@@ -1,7 +1,6 @@
 ---
 :units:
 - Default Unit
-- New Unit
 :identifier_types:
   local: Catalog Key
   oclc: OCLC