Download as
Browse Code »

Commit 5dd2f36ae153ac5a933a4e6ae0ae773508aa1f74

Authored by Jeroen van Baarsen
1 parent 25eadf0c
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Added API testing group

Showing 20 changed files with 39 additions and 37 deletions   Show diff stats
lib/tasks/spec.rake
  Diff comments   View file @5dd2f36
1   -namespace :testing do
2   - desc 'GITLAB | Run model specs'
3   - task :models do
4   - cmds = [
5   - %W(rake gitlab:setup),
6   - %W(rspec spec --tag @models)
7   - ]
8   - run_commands(cmds)
9   - end
  1 +Rake::Task["spec"].clear if Rake::Task.task_defined?('spec')
10 2  
  3 +namespace :spec do
11 4 desc 'GITLAB | Run feature specs'
12   - task :features do
  5 + task :api do
13 6 cmds = [
14 7 %W(rake gitlab:setup),
15   - %W(rspec spec --tag @features)
  8 + %W(rspec spec --tag @api)
16 9 ]
17 10 run_commands(cmds)
18 11 end
... ... @@ -21,15 +14,24 @@ namespace :testing do
21 14 task :other do
22 15 cmds = [
23 16 %W(rake gitlab:setup),
24   - %W(rspec spec --tag ~@models --tag ~@features)
  17 + %W(rspec spec --tag ~@api)
25 18 ]
26 19 run_commands(cmds)
27 20 end
  21 +end
  22 +
  23 +desc "GITLAB | Run specs"
  24 +task :spec do
  25 + cmds = [
  26 + %W(rake gitlab:setup),
  27 + %W(rspec spec),
  28 + ]
  29 + run_commands(cmds)
  30 +end
28 31  
29   - def run_commands(cmds)
30   - cmds.each do |cmd|
31   - system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
32   - raise "#{cmd} failed!" unless $?.exitstatus.zero?
33   - end
  32 +def run_commands(cmds)
  33 + cmds.each do |cmd|
  34 + system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
  35 + raise "#{cmd} failed!" unless $?.exitstatus.zero?
34 36 end
35 37 end
... ...
spec/requests/api/api_helpers_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API do
  3 +describe API, api: true do
4 4 include API::APIHelpers
5 5 include ApiHelpers
6 6 let(:user) { create(:user) }
... ... @@ -158,4 +158,4 @@ describe API do
158 158 sudo_identifier.should == ' 123'
159 159 end
160 160 end
161   -end
162 161 \ No newline at end of file
  162 +end
... ...
spec/requests/api/branches_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2 require 'mime/types'
3 3  
4   -describe API::API do
  4 +describe API::API, api: true do
5 5 include ApiHelpers
6 6 before(:each) { enable_observers }
7 7 after(:each) {disable_observers}
... ...
spec/requests/api/commits_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2 require 'mime/types'
3 3  
4   -describe API::API do
  4 +describe API::API, api: true do
5 5 include ApiHelpers
6 6 before(:each) { enable_observers }
7 7 after(:each) {disable_observers}
... ...
spec/requests/api/files_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5 before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
6 6 after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
... ...
spec/requests/api/groups_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5  
6 6 let(:user1) { create(:user) }
... ...
spec/requests/api/internal_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5 before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
6 6 after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
... ...
spec/requests/api/issues_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5 before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
6 6 after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
... ...
spec/requests/api/merge_requests_spec.rb
  Diff comments   View file @5dd2f36
1 1 require "spec_helper"
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5 before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
6 6 after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
... ...
spec/requests/api/milestones_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5 before(:each) { enable_observers }
6 6 after(:each) {disable_observers}
... ...
spec/requests/api/namespaces_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5 before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
6 6 after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
... ...
spec/requests/api/notes_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5 before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
6 6 after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
... ...
spec/requests/api/project_hooks_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API::API, 'ProjectHooks' do
  3 +describe API::API, 'ProjectHooks', api: true do
4 4 include ApiHelpers
5 5 before(:each) { enable_observers }
6 6 after(:each) { disable_observers }
... ...
spec/requests/api/project_members_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5 before(:each) { enable_observers }
6 6 after(:each) { disable_observers }
... ...
spec/requests/api/projects_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5 before(:each) { enable_observers }
6 6 after(:each) { disable_observers }
... ...
spec/requests/api/repositories_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2 require 'mime/types'
3 3  
4   -describe API::API do
  4 +describe API::API, api: true do
5 5 include ApiHelpers
6 6 before(:each) { enable_observers }
7 7 after(:each) {disable_observers}
... ...
spec/requests/api/services_spec.rb
  Diff comments   View file @5dd2f36
1 1 require "spec_helper"
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5 before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
6 6 after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
... ...
spec/requests/api/session_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5  
6 6 let(:user) { create(:user) }
... ...
spec/requests/api/system_hooks_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5  
6 6 let(:user) { create(:user) }
... ...
spec/requests/api/users_spec.rb
  Diff comments   View file @5dd2f36
1 1 require 'spec_helper'
2 2  
3   -describe API::API do
  3 +describe API::API, api: true do
4 4 include ApiHelpers
5 5  
6 6 let(:user) { create(:user) }
... ...