From fa573191311863c783b6302b1c040fe2b4c5453a Mon Sep 17 00:00:00 2001 From: adamjacobbecker Date: Thu, 26 Sep 2013 11:47:37 -0400 Subject: [PATCH] small bits of reorganization --- spec/{ => fixtures}/test_files/text.txt | 0 spec/{ => fixtures}/test_files/text2.txt | 0 spec/spec_helper.rb | 2 +- spec/support/submitting_an_entry_spec_helper.rb | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename spec/{ => fixtures}/test_files/text.txt (100%) rename spec/{ => fixtures}/test_files/text2.txt (100%) diff --git a/spec/test_files/text.txt b/spec/fixtures/test_files/text.txt similarity index 100% rename from spec/test_files/text.txt rename to spec/fixtures/test_files/text.txt diff --git a/spec/test_files/text2.txt b/spec/fixtures/test_files/text2.txt similarity index 100% rename from spec/test_files/text2.txt rename to spec/fixtures/test_files/text2.txt diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f9a8e73..dcc41f5 100644 --- 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 index 4f87abd..19f1076 100644 --- 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