diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-11 23:54:49 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-11 23:54:49 +0400 |
commit | 0f31acd0ec9b8a6ccfe9c6b0038736ad724814c0 (patch) | |
tree | cc5ba25d54a6514ed9bef5feb727c8a93b984354 /spec | |
parent | 1942b97de3071d95c545b696462c3ae14e94bc72 (diff) | |
parent | 490ab228e662f42a88e389469fd79b1274b4cf4a (diff) |
Merge pull request #6753 from jvanbaarsen/split_tests
Proposal for split testing
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/gitlab_flavored_markdown_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/assembla_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/api_helpers_spec.rb | 4 | ||||
-rw-r--r-- | spec/requests/api/branches_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/commits_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/files_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/groups_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/internal_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/issues_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/milestones_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/namespaces_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/notes_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/project_hooks_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/project_members_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/projects_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/repositories_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/services_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/session_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/system_hooks_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/users_spec.rb | 2 |
21 files changed, 22 insertions, 22 deletions
diff --git a/spec/features/gitlab_flavored_markdown_spec.rb b/spec/features/gitlab_flavored_markdown_spec.rb index a507f0314c6..07be6b81441 100644 --- a/spec/features/gitlab_flavored_markdown_spec.rb +++ b/spec/features/gitlab_flavored_markdown_spec.rb @@ -1,6 +1,6 @@ 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) } diff --git a/spec/models/assembla_service_spec.rb b/spec/models/assembla_service_spec.rb index 8b964bccc0b..acc08fc4d69 100644 --- a/spec/models/assembla_service_spec.rb +++ b/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 } diff --git a/spec/requests/api/api_helpers_spec.rb b/spec/requests/api/api_helpers_spec.rb index 2fc78a7e390..6f961d321bd 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 f792c618e67..abf6a8646ec 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 ea317e1137a..165276d1435 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 fa25a4bec6a..edfe935d985 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 1a5f11038b7..6fcab85335a 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 5f6dff92c0a..8797c3fbbbf 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 0b4f22bfb3d..e62bc844352 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 9530f7ceb04..3918498e22f 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 febfc63921e..0d2740c5acf 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 2b1a4bf6ec8..2de7d1e23c3 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 6ed96eb97f3..81576f7c235 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 c8ace0b9462..6e281f5a43e 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 f3c0529da92..ec2d6e85096 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 7fe65639657..4b8f41a4683 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 44c561eab58..5a5222ed3c5 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 aecd18bc14a..684f8615999 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 668007dc29f..013f425d6ce 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 b1df3cb7886..5784ae8c23a 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 c4be5102002..86610c47513 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) } |