From 317c2b687fc2118f2de0973308ed82ab882d18cc Mon Sep 17 00:00:00 2001
From: Thibault Jouan <tj@a13.fr>
Date: Sun, 3 May 2015 22:58:05 +0000
Subject: [PATCH] Refactor UAT helpers inclusion in specs

---
 spec/features/playlists/crud_spec.rb              | 2 --
 spec/features/sounds/crud_spec.rb                 | 2 --
 spec/features/tracks/crud_spec.rb                 | 2 --
 spec/features/tracks/player_spec.rb               | 2 --
 spec/integration/api/application_spec.rb          | 2 --
 spec/integration/api/cross_origin_request_spec.rb | 2 --
 spec/integration/api/playlists_spec.rb            | 2 --
 spec/integration/api/sign_in_spec.rb              | 2 --
 spec/integration/api/tracks_spec.rb               | 2 --
 spec/spec_helper.rb                               | 2 ++
 10 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/spec/features/playlists/crud_spec.rb b/spec/features/playlists/crud_spec.rb
index bc9bc03..3b32ebd 100644
--- a/spec/features/playlists/crud_spec.rb
+++ b/spec/features/playlists/crud_spec.rb
@@ -1,6 +1,4 @@
 feature 'Playlists CRUD' do
-  include AcceptanceHelpers
-
   background { sign_in }
 
   scenario 'edits playlist' do
diff --git a/spec/features/sounds/crud_spec.rb b/spec/features/sounds/crud_spec.rb
index 436b466..f41a949 100644
--- a/spec/features/sounds/crud_spec.rb
+++ b/spec/features/sounds/crud_spec.rb
@@ -1,6 +1,4 @@
 feature 'Sounds CRUD' do
-  include AcceptanceHelpers
-
   background { sign_in }
 
   scenario 'shows sound' do
diff --git a/spec/features/tracks/crud_spec.rb b/spec/features/tracks/crud_spec.rb
index dd5e082..b92e2a9 100644
--- a/spec/features/tracks/crud_spec.rb
+++ b/spec/features/tracks/crud_spec.rb
@@ -1,6 +1,4 @@
 feature 'Tracks CRUD' do
-  include AcceptanceHelpers
-
   background { sign_in }
 
   scenario 'shows track' do
diff --git a/spec/features/tracks/player_spec.rb b/spec/features/tracks/player_spec.rb
index b29f796..fda4d9f 100644
--- a/spec/features/tracks/player_spec.rb
+++ b/spec/features/tracks/player_spec.rb
@@ -1,6 +1,4 @@
 feature 'Tracks player' do
-  include AcceptanceHelpers
-
   background { sign_in }
 
   scenario 'includes a player in track page' do
diff --git a/spec/integration/api/application_spec.rb b/spec/integration/api/application_spec.rb
index 283a3ad..870c4c4 100644
--- a/spec/integration/api/application_spec.rb
+++ b/spec/integration/api/application_spec.rb
@@ -1,6 +1,4 @@
 describe 'API application' do
-  include AcceptanceHelpers
-
   describe 'ping endpoint' do
     before { get api_ping_path, format: :json }
 
diff --git a/spec/integration/api/cross_origin_request_spec.rb b/spec/integration/api/cross_origin_request_spec.rb
index 7ce1d38..3e8f2c1 100644
--- a/spec/integration/api/cross_origin_request_spec.rb
+++ b/spec/integration/api/cross_origin_request_spec.rb
@@ -1,6 +1,4 @@
 describe 'API cross origin request' do
-  include AcceptanceHelpers
-
   let(:user)    { api_sign_in }
   let(:origin)  { 'http://origin.example/' }
 
diff --git a/spec/integration/api/playlists_spec.rb b/spec/integration/api/playlists_spec.rb
index da04217..d6a7baa 100644
--- a/spec/integration/api/playlists_spec.rb
+++ b/spec/integration/api/playlists_spec.rb
@@ -1,6 +1,4 @@
 describe 'API playlists' do
-  include AcceptanceHelpers
-
   before { api_sign_in }
 
   it 'lists playlists' do
diff --git a/spec/integration/api/sign_in_spec.rb b/spec/integration/api/sign_in_spec.rb
index cbb8c4a..5bee9ad 100644
--- a/spec/integration/api/sign_in_spec.rb
+++ b/spec/integration/api/sign_in_spec.rb
@@ -1,6 +1,4 @@
 describe 'API sign in' do
-  include AcceptanceHelpers
-
   let(:user) { create :user }
 
   def do_create
diff --git a/spec/integration/api/tracks_spec.rb b/spec/integration/api/tracks_spec.rb
index a23f8a2..6564473 100644
--- a/spec/integration/api/tracks_spec.rb
+++ b/spec/integration/api/tracks_spec.rb
@@ -1,6 +1,4 @@
 describe 'API tracks' do
-  include AcceptanceHelpers
-
   let(:track)       { create :track_with_sound }
   let(:other_track) { create :track }
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8c98cb4..24a644e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,6 +10,8 @@ Spork.prefork do
   RSpec.configure do |config|
     config.backtrace_exclusion_patterns << /\/bundler\/gems\//
     config.include FactoryGirl::Syntax::Methods
+    config.include AcceptanceHelpers, type: :feature
+    config.include AcceptanceHelpers, type: :request
     config.infer_spec_type_from_file_location!
     config.use_transactional_fixtures = true
     config.after(:all) do