Merge pull request #6753 from jvanbaarsen/split_tests

Proposal for split testing

.travis.yml

@@ -4,10 +4,12 @@ env:
     - TRAVIS=true
   matrix:
     - TASK=spinach DB=mysql
-    - TASK=spec DB=mysql
+    - TASK=spec:api DB=mysql
+    - TASK=spec:other DB=mysql
     - TASK=jasmine:ci DB=mysql
     - TASK=spinach DB=postgresql
-    - TASK=spec DB=postgresql
+    - TASK=spec:api DB=mysql
+    - TASK=spec:other DB=postgresql
     - TASK=jasmine:ci DB=postgresql
 before_install:
   - sudo apt-get install libicu-dev -y

lib/tasks/spec.rake

 Rake::Task["spec"].clear if Rake::Task.task_defined?('spec')
 
+namespace :spec do
+  desc 'GITLAB | Run feature specs'
+  task :api do
+    cmds = [
+      %W(rake gitlab:setup),
+      %W(rspec spec --tag @api)
+    ]
+    run_commands(cmds)
+  end
+
+  desc 'GITLAB | Run other specs'
+  task :other do
+    cmds = [
+      %W(rake gitlab:setup),
+      %W(rspec spec --tag ~@api)
+    ]
+    run_commands(cmds)
+  end
+end
+
 desc "GITLAB | Run specs"
 task :spec do
   cmds = [
     %W(rake gitlab:setup),
     %W(rspec spec),
   ]
+  run_commands(cmds)
+end
 
+def run_commands(cmds)
   cmds.each do |cmd|
     system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
     raise "#{cmd} failed!" unless $?.exitstatus.zero?

spec/features/gitlab_flavored_markdown_spec.rb

 require 'spec_helper'
 
-describe "GitLab Flavored Markdown" do
+describe "GitLab Flavored Markdown", features: true do
   let(:project) { create(:project) }
   let(:issue) { create(:issue, project: project) }
   let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }

spec/models/assembla_service_spec.rb

@@ -19,7 +19,7 @@
 
 require 'spec_helper'
 
-describe AssemblaService do
+describe AssemblaService, models: true do
   describe "Associations" do
     it { should belong_to :project }
     it { should have_one :service_hook }

spec/requests/api/api_helpers_spec.rb

 require 'spec_helper'
 
-describe API do
+describe API, api: true do
   include API::APIHelpers
   include ApiHelpers
   let(:user) { create(:user) }
@@ -158,4 +158,4 @@ describe API do
       sudo_identifier.should == ' 123'
     end
   end
-end
+end
\ No newline at end of file

spec/requests/api/branches_spec.rb

 require 'spec_helper'
 require 'mime/types'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
   before(:each) { enable_observers }
   after(:each) {disable_observers}

spec/requests/api/commits_spec.rb

 require 'spec_helper'
 require 'mime/types'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
   before(:each) { enable_observers }
   after(:each) {disable_observers}

spec/requests/api/files_spec.rb

 require 'spec_helper'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
   before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
   after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }

spec/requests/api/groups_spec.rb

 require 'spec_helper'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
 
   let(:user1) { create(:user) }

spec/requests/api/internal_spec.rb

 require 'spec_helper'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
   before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
   after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }

spec/requests/api/issues_spec.rb

 require 'spec_helper'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
   before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
   after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }

spec/requests/api/merge_requests_spec.rb

 require "spec_helper"
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
   before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
   after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }

spec/requests/api/milestones_spec.rb

 require 'spec_helper'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
   before(:each) { enable_observers }
   after(:each) {disable_observers}

spec/requests/api/namespaces_spec.rb

 require 'spec_helper'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
   before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
   after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }

spec/requests/api/notes_spec.rb

 require 'spec_helper'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
   before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
   after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }

spec/requests/api/project_hooks_spec.rb

 require 'spec_helper'
 
-describe API::API, 'ProjectHooks' do
+describe API::API, 'ProjectHooks', api: true  do
   include ApiHelpers
   before(:each) { enable_observers }
   after(:each) { disable_observers }

spec/requests/api/project_members_spec.rb

 require 'spec_helper'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
   before(:each) { enable_observers }
   after(:each) { disable_observers }

spec/requests/api/projects_spec.rb

 require 'spec_helper'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
   before(:each) { enable_observers }
   after(:each) { disable_observers }

spec/requests/api/repositories_spec.rb

 require 'spec_helper'
 require 'mime/types'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
   before(:each) { enable_observers }
   after(:each) {disable_observers}

spec/requests/api/services_spec.rb

 require "spec_helper"
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
   before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
   after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }

spec/requests/api/session_spec.rb

 require 'spec_helper'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
 
   let(:user) { create(:user) }

spec/requests/api/system_hooks_spec.rb

 require 'spec_helper'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
 
   let(:user) { create(:user) }

spec/requests/api/users_spec.rb

 require 'spec_helper'
 
-describe API::API do
+describe API::API, api: true  do
   include ApiHelpers
 
   let(:user)  { create(:user) }