small bits of reorganization

dobtco · Sep 26, 2013 · fa57319 · fa57319
1 parent 7f5321f
commit fa57319
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/spec/test_files/text.txt → spec/fixtures/test_files/text.txt b/spec/test_files/text.txt → spec/fixtures/test_files/text.txt
diff --git a/spec/test_files/text2.txt → spec/fixtures/test_files/text2.txt b/spec/test_files/text2.txt → spec/fixtures/test_files/text2.txt
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -17,7 +17,7 @@
 require 'rspec/rails'
 require 'capybara/rspec'
 
-  Dir[Rails.root.join("../../spec/support/**/*.rb")].each {|f| require f}
+Dir[Rails.root.join("../../spec/support/**/*.rb")].each {|f| require f}
 
 RSpec.configure do |config|
   config.order = "random"

diff --git a/spec/support/submitting_an_entry_spec_helper.rb b/spec/support/submitting_an_entry_spec_helper.rb
@@ -65,7 +65,7 @@ def test_field_values
       time: { hours: '1', minutes: '12', seconds: '00', am_pm: 'PM' },
       website: 'www.google.com',
       email: 'strongbad@homestarrunner.com',
-      file: '../test_files/text.txt',
+      file: '../fixtures/test_files/text.txt',
       address: { street: '123 Main St.', city: 'Oakland', state: 'California', zipcode: '94609', country: 'United Kingdom' }
     }
   end
@@ -83,7 +83,7 @@ def test_field_values_two
       time: { hours: '12', minutes: '1', seconds: '30', am_pm: 'AM' },
       website: 'www.gizoogle.com',
       email: 'homestar@homestarrunner.com',
-      file: '../test_files/text2.txt',
+      file: '../fixtures/test_files/text2.txt',
       address: { street: '125 Main St.', city: 'Berkeley', state: 'California', zipcode: '94704', country: 'Algeria' }
     }
   end