spec/fetch_spec.rb in bagit-0.4.2 vs spec/fetch_spec.rb in bagit-0.4.3

@@ -1,57 +1,51 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe "fetch.txt" do
-
-  before(:each) do
-
+describe BagIt::Bag do
+  before do
     @sandbox = Sandbox.new
-
     # make the bag
     @bag_path = File.join @sandbox.to_s, 'the_bag'
-    @bag = BagIt::Bag.new @bag_path
+    @bag = described_class.new(@bag_path)
 
     # add some files
     File.open('/dev/urandom') do |rio|
-
       10.times do |n|
         @bag.add_file("file-#{n}-💩
") { |io| io.write rio.read(16) }
       end
-
     end
-
   end
+  describe "fetch.txt" do
+    after do
+      @sandbox.cleanup!
+    end
 
-  after(:each) do
-    @sandbox.cleanup!
-  end
+    before do
+      @bag.add_remote_file('http://www.gnu.org/graphics/heckert_gnu.small.png', 'gnu.png', 6322,
+                           '390c0a30976f899cbdf951eab5cce60fe9743ac9',
+                           'a3bd7ab2442028bb91b51d9f6722ec98')
 
-  before(:each) do
-    @bag.add_remote_file('http://www.gnu.org/graphics/heckert_gnu.small.png', 'gnu.png', 6322,
-                         '390c0a30976f899cbdf951eab5cce60fe9743ac9',
-                         'a3bd7ab2442028bb91b51d9f6722ec98')
+      path = File.join @bag_path, 'fetch.txt'
+      @lines = File.open(path, &:readlines)
+    end
 
-    path = File.join @bag_path, 'fetch.txt'
-    @lines = File.open(path) { |io| io.readlines }
-  end
+    it "isn't empty" do
+      expect(@lines).not_to be_empty
+    end
 
-  it "should not be empty" do
-    expect(@lines).not_to be_empty
-  end
+    it "only contains lines of the format URL LENGTH FILENAME" do
+      @lines.each { |line| expect(line.chomp).to match(/^[^\s]+\s+(\d+|\-)\s+[^\s]+$/) }
+    end
 
-  it "should only contain lines of the format URL LENGTH FILENAME" do
-    @lines.each { |line| expect(line.chomp).to match(/^[^\s]+\s+(\d+|\-)\s+[^\s]+$/) }
-  end
+    it "contains manifested files" do
+      path = File.join @bag_path, 'manifest-sha1.txt'
+      data = File.open(path, &:read)
+      expect(data).to include('gnu.png')
+    end
 
-  it "should contain manifested files" do
-    path = File.join @bag_path, 'manifest-sha1.txt'
-    data = File.open(path) { |io| io.read }
-    expect(data).to include('gnu.png')
+    it "is gone when fetch is complete" do
+      @bag.fetch!
+      expect(File.exist?(File.join(@bag_path, 'fetch.txt'))).not_to be true
+    end
   end
-
-  it "should be gone when fetch is complete" do
-    @bag.fetch!
-    expect(File.exist?(File.join(@bag_path, 'fetch.txt'))).not_to be true
-  end
-
 end