From 5dd2f36ae153ac5a933a4e6ae0ae773508aa1f74 Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Fri, 11 Apr 2014 21:45:56 +0200 Subject: [PATCH] Added API testing group --- lib/tasks/spec.rake | 36 +++++++++++++++++++----------------- spec/requests/api/api_helpers_spec.rb | 4 ++-- spec/requests/api/branches_spec.rb | 2 +- spec/requests/api/commits_spec.rb | 2 +- spec/requests/api/files_spec.rb | 2 +- spec/requests/api/groups_spec.rb | 2 +- spec/requests/api/internal_spec.rb | 2 +- spec/requests/api/issues_spec.rb | 2 +- spec/requests/api/merge_requests_spec.rb | 2 +- spec/requests/api/milestones_spec.rb | 2 +- spec/requests/api/namespaces_spec.rb | 2 +- spec/requests/api/notes_spec.rb | 2 +- spec/requests/api/project_hooks_spec.rb | 2 +- spec/requests/api/project_members_spec.rb | 2 +- spec/requests/api/projects_spec.rb | 2 +- spec/requests/api/repositories_spec.rb | 2 +- spec/requests/api/services_spec.rb | 2 +- spec/requests/api/session_spec.rb | 2 +- spec/requests/api/system_hooks_spec.rb | 2 +- spec/requests/api/users_spec.rb | 2 +- 20 files changed, 39 insertions(+), 37 deletions(-) diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake index 1f6ceca..b760a60 100644 --- a/lib/tasks/spec.rake +++ b/lib/tasks/spec.rake @@ -1,18 +1,11 @@ -namespace :testing do - desc 'GITLAB | Run model specs' - task :models do - cmds = [ - %W(rake gitlab:setup), - %W(rspec spec --tag @models) - ] - run_commands(cmds) - end +Rake::Task["spec"].clear if Rake::Task.task_defined?('spec') +namespace :spec do desc 'GITLAB | Run feature specs' - task :features do + task :api do cmds = [ %W(rake gitlab:setup), - %W(rspec spec --tag @features) + %W(rspec spec --tag @api) ] run_commands(cmds) end @@ -21,15 +14,24 @@ namespace :testing do task :other do cmds = [ %W(rake gitlab:setup), - %W(rspec spec --tag ~@models --tag ~@features) + %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? - end +def run_commands(cmds) + cmds.each do |cmd| + system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd) + raise "#{cmd} failed!" unless $?.exitstatus.zero? end end diff --git a/spec/requests/api/api_helpers_spec.rb b/spec/requests/api/api_helpers_spec.rb index 2fc78a7..6f961d3 100644 --- a/spec/requests/api/api_helpers_spec.rb +++ b/spec/requests/api/api_helpers_spec.rb @@ -1,6 +1,6 @@ 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 \ No newline at end of file +end diff --git a/spec/requests/api/branches_spec.rb b/spec/requests/api/branches_spec.rb index f792c61..abf6a86 100644 --- a/spec/requests/api/branches_spec.rb +++ b/spec/requests/api/branches_spec.rb @@ -1,7 +1,7 @@ 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} diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb index ea317e1..165276d 100644 --- a/spec/requests/api/commits_spec.rb +++ b/spec/requests/api/commits_spec.rb @@ -1,7 +1,7 @@ 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} diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb index fa25a4b..edfe935 100644 --- a/spec/requests/api/files_spec.rb +++ b/spec/requests/api/files_spec.rb @@ -1,6 +1,6 @@ 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) } diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb index 1a5f110..6fcab85 100644 --- a/spec/requests/api/groups_spec.rb +++ b/spec/requests/api/groups_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe API::API do +describe API::API, api: true do include ApiHelpers let(:user1) { create(:user) } diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index 5f6dff9..8797c3f 100644 --- a/spec/requests/api/internal_spec.rb +++ b/spec/requests/api/internal_spec.rb @@ -1,6 +1,6 @@ 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) } diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb index 0b4f22b..e62bc84 100644 --- a/spec/requests/api/issues_spec.rb +++ b/spec/requests/api/issues_spec.rb @@ -1,6 +1,6 @@ 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) } diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 9530f7c..3918498 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -1,6 +1,6 @@ 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) } diff --git a/spec/requests/api/milestones_spec.rb b/spec/requests/api/milestones_spec.rb index febfc63..0d2740c 100644 --- a/spec/requests/api/milestones_spec.rb +++ b/spec/requests/api/milestones_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe API::API do +describe API::API, api: true do include ApiHelpers before(:each) { enable_observers } after(:each) {disable_observers} diff --git a/spec/requests/api/namespaces_spec.rb b/spec/requests/api/namespaces_spec.rb index 2b1a4bf..2de7d1e 100644 --- a/spec/requests/api/namespaces_spec.rb +++ b/spec/requests/api/namespaces_spec.rb @@ -1,6 +1,6 @@ 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) } diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb index 6ed96eb..81576f7 100644 --- a/spec/requests/api/notes_spec.rb +++ b/spec/requests/api/notes_spec.rb @@ -1,6 +1,6 @@ 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) } diff --git a/spec/requests/api/project_hooks_spec.rb b/spec/requests/api/project_hooks_spec.rb index c8ace0b..6e281f5 100644 --- a/spec/requests/api/project_hooks_spec.rb +++ b/spec/requests/api/project_hooks_spec.rb @@ -1,6 +1,6 @@ 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 } diff --git a/spec/requests/api/project_members_spec.rb b/spec/requests/api/project_members_spec.rb index f3c0529..ec2d6e8 100644 --- a/spec/requests/api/project_members_spec.rb +++ b/spec/requests/api/project_members_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe API::API do +describe API::API, api: true do include ApiHelpers before(:each) { enable_observers } after(:each) { disable_observers } diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index 7fe6563..4b8f41a 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe API::API do +describe API::API, api: true do include ApiHelpers before(:each) { enable_observers } after(:each) { disable_observers } diff --git a/spec/requests/api/repositories_spec.rb b/spec/requests/api/repositories_spec.rb index 44c561e..5a5222e 100644 --- a/spec/requests/api/repositories_spec.rb +++ b/spec/requests/api/repositories_spec.rb @@ -1,7 +1,7 @@ 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} diff --git a/spec/requests/api/services_spec.rb b/spec/requests/api/services_spec.rb index aecd18b..684f861 100644 --- a/spec/requests/api/services_spec.rb +++ b/spec/requests/api/services_spec.rb @@ -1,6 +1,6 @@ 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) } diff --git a/spec/requests/api/session_spec.rb b/spec/requests/api/session_spec.rb index 668007d..013f425 100644 --- a/spec/requests/api/session_spec.rb +++ b/spec/requests/api/session_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe API::API do +describe API::API, api: true do include ApiHelpers let(:user) { create(:user) } diff --git a/spec/requests/api/system_hooks_spec.rb b/spec/requests/api/system_hooks_spec.rb index b1df3cb..5784ae8 100644 --- a/spec/requests/api/system_hooks_spec.rb +++ b/spec/requests/api/system_hooks_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe API::API do +describe API::API, api: true do include ApiHelpers let(:user) { create(:user) } diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index c4be510..86610c4 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe API::API do +describe API::API, api: true do include ApiHelpers let(:user) { create(:user) } -- libgit2 0.21.2