Reorganized specs into specs/unit_tests and specs/acceptance_tests di…

…rectories. Added metadata to all tests to let rspec-rails know the type of each test suite (controller, model, feature etc).

Older rspec-rails versions demanded a particular directory structure for the specs, so that e.g. controllers tests (which had to be in /specs/controllers) had a module mixed in during testing, to enable helper methods necessary for each type of test (e.g. accessing response headers directly during controller tests).

This is being deprecated and it will become opt-in in rspec-rails 3. A particular directory structure will no longer be enforced, each test suite will have to specify the type of test by using metadata (a :type named argument to the "describe" method at the top of each file).

I've gone ahead and, in preparation for rspec-rails 3, I've added metadata to all tests which make use of rspec-rails helper methods. Now that a particular directory structure is no longer enforced, I've reorganized tests in a "unit_tests" and "acceptance_tests" structure which is more confortable for me.

For details about the old directory structure and the new metadata-based spect type specification, see:

https://relishapp.com/rspec/rspec-rails/v/3-0/docs/directory-structure

For interesting discussions about this topic see:

rspec/rspec-rails#662
https://github.com/rspec/rspec-rails/pull/970/files
rspec/rspec-rails#1002

lib/tasks/rspec.rake

@@ -6,9 +6,9 @@ if Rails.env=='ci'
     desc 'Run tests depending on the TEST_SUITE env variable: "unit"=>unit tests, "acceptance"=>acceptance tests'
     RSpec::Core::RakeTask.new(:travisci) do |task|
       all_tests = FileList['spec/**/*_spec.rb']
-      unit_tests = FileList['spec/**/*_spec.rb'].exclude 'spec/features/**/*_spec.rb'
-      acceptance_tests_1 = FileList['spec/features/suite_1/**/*_spec.rb']
-      acceptance_tests_2 = FileList['spec/features/suite_2/**/*_spec.rb']
+      unit_tests = FileList['spec/unit_tests/**/*_spec.rb']
+      acceptance_tests_1 = FileList['spec/acceptance_tests/suite_1/**/*_spec.rb']
+      acceptance_tests_2 = FileList['spec/acceptance_tests/suite_2/**/*_spec.rb']
 
       if ENV['TEST_SUITE'] == 'unit'
         # Include only unit tests

spec/features/suite_1/alert_closing_spec.rb → spec/acceptance_tests/suite_1/alert_closing_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'automatically closing notices and alerts' do
+describe 'automatically closing notices and alerts', type: :feature do
   before :each do
     @user = FactoryGirl.create :user
   end

spec/features/suite_1/authentication_spec.rb → spec/acceptance_tests/suite_1/authentication_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'authentication' do
+describe 'authentication', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user

spec/features/suite_1/authorization_spec.rb → spec/acceptance_tests/suite_1/authorization_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'authorization' do
+describe 'authorization', type: :feature do
 
   before :each do
     @normal_user = FactoryGirl.create :user

spec/features/suite_1/export_subscriptions_spec.rb → spec/acceptance_tests/suite_1/export_subscriptions_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'export subscriptions' do
+describe 'export subscriptions', type: :feature do
   before :each do
     @user = FactoryGirl.create :user
     @feed = FactoryGirl.create :feed

spec/features/suite_1/feeds_spec.rb → spec/acceptance_tests/suite_1/feeds_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'feeds' do
+describe 'feeds', type: :feature do
 
   it 'redirects unauthenticated visitors to login page' do
     visit read_path

spec/features/suite_1/folders_spec.rb → spec/acceptance_tests/suite_1/folders_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'folders and feeds' do
+describe 'folders and feeds', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user

spec/features/suite_1/refresh_feed_spec.rb → spec/acceptance_tests/suite_1/refresh_feed_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'refresh feeds' do
+describe 'refresh feeds', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user

spec/features/suite_1/start_page_spec.rb → spec/acceptance_tests/suite_1/start_page_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'start page' do
+describe 'start page', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user

spec/features/suite_2/entries_spec.rb → spec/acceptance_tests/suite_2/entries_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'feed entries' do
+describe 'feed entries', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user

spec/features/suite_2/feed_subscription_spec.rb → spec/acceptance_tests/suite_2/feed_subscription_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'subscription to feeds' do
+describe 'subscription to feeds', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user

spec/features/suite_2/feed_unsubscribe_spec.rb → spec/acceptance_tests/suite_2/feed_unsubscribe_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'unsubscribe from feed' do
+describe 'unsubscribe from feed', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user

spec/features/suite_2/import_subscriptions_spec.rb → spec/acceptance_tests/suite_2/import_subscriptions_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'import subscriptions' do
+describe 'import subscriptions', type: :feature do
   before :each do
     @data_file = File.join __dir__, '..', '..', 'attachments', '[email protected]'
 

spec/features/suite_2/quick_reading_spec.rb → spec/acceptance_tests/suite_2/quick_reading_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'quick reading mode' do
+describe 'quick reading mode', type: :feature do
 
   context 'mark entries open when scrolling' do
 

spec/features/suite_2/unread_entries_count_spec.rb → spec/acceptance_tests/suite_2/unread_entries_count_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'unread entries count' do
+describe 'unread entries count', type: :feature do
 
   before :each do
     @user = FactoryGirl.create :user

spec/controllers/entries_controller_spec.rb → spec/unit_tests/controllers/entries_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::EntriesController do
+describe Api::EntriesController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user

spec/controllers/feeds_controller_spec.rb → spec/unit_tests/controllers/feeds_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::FeedsController do
+describe Api::FeedsController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user

spec/controllers/folders_controller_spec.rb → spec/unit_tests/controllers/folders_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::FoldersController do
+describe Api::FoldersController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user

spec/controllers/opml_exports_controller_spec.rb → spec/unit_tests/controllers/opml_exports_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::OpmlExportsController do
+describe Api::OpmlExportsController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user

spec/controllers/opml_imports_controller_spec.rb → spec/unit_tests/controllers/opml_imports_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::OpmlImportsController do
+describe Api::OpmlImportsController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user

spec/controllers/profiles_controller_spec.rb → spec/unit_tests/controllers/profiles_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Devise::ProfilesController do
+describe Devise::ProfilesController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user

spec/controllers/read_controller_spec.rb → spec/unit_tests/controllers/read_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ReadController do
+describe ReadController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user

spec/controllers/refresh_feed_job_states_controller_spec.rb → spec/unit_tests/controllers/refresh_feed_job_states_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::RefreshFeedJobStatesController do
+describe Api::RefreshFeedJobStatesController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user

spec/controllers/subscribe_job_states_controller_spec.rb → spec/unit_tests/controllers/subscribe_job_states_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::SubscribeJobStatesController do
+describe Api::SubscribeJobStatesController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user

spec/controllers/user_configs_controller_spec.rb → spec/unit_tests/controllers/user_configs_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::UserConfigsController do
+describe Api::UserConfigsController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user

spec/controllers/user_data_controller_spec.rb → spec/unit_tests/controllers/user_data_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Api::UserDataController do
+describe Api::UserDataController, type: :controller do
 
   before :each do
     @user = FactoryGirl.create :user

spec/models/deleted_entry_spec.rb → spec/unit_tests/models/deleted_entry_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DeletedEntry do
+describe DeletedEntry, type: :model do
 
   before :each do
     @deleted_entry = FactoryGirl.create :deleted_entry

spec/models/entry_spec.rb → spec/unit_tests/models/entry_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Entry do
+describe Entry, type: :model do
 
   before :each do
     @entry = FactoryGirl.create :entry

spec/models/entry_state_spec.rb → spec/unit_tests/models/entry_state_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe EntryState do
+describe EntryState, type: :model do
 
   context 'validations' do
 

spec/models/feed_spec.rb → spec/unit_tests/models/feed_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Feed do
+describe Feed, type: :model do
 
   before :each do
     @feed = FactoryGirl.create :feed

spec/models/feed_subscription_spec.rb → spec/unit_tests/models/feed_subscription_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe FeedSubscription do
+describe FeedSubscription, type: :model do
 
   before :each do
     @feed_subscription = FactoryGirl.create :feed_subscription

spec/models/folder_spec.rb → spec/unit_tests/models/folder_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Folder do
+describe Folder, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @folder = FactoryGirl.build :folder, user_id: @user.id

spec/models/opml_export_job_state_spec.rb → spec/unit_tests/models/opml_export_job_state_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe OpmlExportJobState do
+describe OpmlExportJobState, type: :model do
 
   before :each do
     @user = FactoryGirl.create :user

spec/models/opml_import_job_state_spec.rb → spec/unit_tests/models/opml_import_job_state_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe OpmlImportJobState do
+describe OpmlImportJobState, type: :model do
 
   before :each do
     @user = FactoryGirl.create :user

spec/models/refresh_feed_job_state_spec.rb → spec/unit_tests/models/refresh_feed_job_state_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe RefreshFeedJobState do
+describe RefreshFeedJobState, type: :model do
 
   context 'validations' do
 

spec/models/subscribe_job_state_spec.rb → spec/unit_tests/models/subscribe_job_state_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SubscribeJobState do
+describe SubscribeJobState, type: :model do
 
   context 'validations' do
 

spec/models/user/user_change_entry_state_spec.rb → spec/unit_tests/models/user/user_change_entry_state_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @feed = FactoryGirl.create :feed

spec/models/user/user_delete_profile_spec.rb → spec/unit_tests/models/user/user_delete_profile_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
   end

spec/models/user/user_export_subscriptions_spec.rb → spec/unit_tests/models/user/user_export_subscriptions_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
   end

spec/models/user/user_import_subscriptions_spec.rb → spec/unit_tests/models/user/user_import_subscriptions_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
   end

spec/models/user/user_move_feed_to_existing_folder_spec.rb → spec/unit_tests/models/user/user_move_feed_to_existing_folder_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @folder = FactoryGirl.build :folder, user_id: @user.id

spec/models/user/user_move_feed_to_new_folder_spec.rb → spec/unit_tests/models/user/user_move_feed_to_new_folder_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @feed = FactoryGirl.create :feed

spec/models/user/user_refresh_feed_spec.rb → spec/unit_tests/models/user/user_refresh_feed_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
 
   before :each do
     @user = FactoryGirl.create :user

spec/models/user/user_remove_feed_from_folder_spec.rb → spec/unit_tests/models/user/user_remove_feed_from_folder_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @feed = FactoryGirl.create :feed

spec/models/user/user_retrieve_entries_spec.rb → spec/unit_tests/models/user/user_retrieve_entries_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
 
   before :each do
     @user = FactoryGirl.create :user

spec/models/user/user_retrieve_feeds_spec.rb → spec/unit_tests/models/user/user_retrieve_feeds_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
 
   before :each do
     @user = FactoryGirl.create :user

spec/models/user/user_spec.rb → spec/unit_tests/models/user/user_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
   end

spec/models/user/user_subscribe_to_feed_spec.rb → spec/unit_tests/models/user/user_subscribe_to_feed_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @feed = FactoryGirl.create :feed

spec/models/user/user_unread_entries_caching_spec.rb → spec/unit_tests/models/user/user_unread_entries_caching_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, type: :model do
   before :each do
     @user = FactoryGirl.create :user
     @feed = FactoryGirl.create :feed