diff options
25 files changed, 36 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml index 65527331128..9bab337f336 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,12 @@ env: matrix: - TASK=spinach DB=mysql - TASK=spec:api DB=mysql + - TASK=spec:feature DB=mysql - TASK=spec:other DB=mysql - TASK=jasmine:ci DB=mysql - TASK=spinach DB=postgresql - TASK=spec:api DB=postgresql + - TASK=spec:feature DB=postgresql - TASK=spec:other DB=postgresql - TASK=jasmine:ci DB=postgresql before_install: diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake index b760a607f7e..49fbe1bd47a 100644 --- a/lib/tasks/spec.rake +++ b/lib/tasks/spec.rake @@ -1,7 +1,7 @@ Rake::Task["spec"].clear if Rake::Task.task_defined?('spec') namespace :spec do - desc 'GITLAB | Run feature specs' + desc 'GITLAB | Run request specs' task :api do cmds = [ %W(rake gitlab:setup), @@ -10,11 +10,20 @@ namespace :spec do run_commands(cmds) end + desc 'GITLAB | Run feature specs' + task :feature do + cmds = [ + %W(rake gitlab:setup), + %W(rspec spec --tag @feature) + ] + run_commands(cmds) + end + desc 'GITLAB | Run other specs' task :other do cmds = [ %W(rake gitlab:setup), - %W(rspec spec --tag ~@api) + %W(rspec spec --tag ~@api --tag ~@feature) ] run_commands(cmds) end diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb index 102a1b928f5..120448ae335 100644 --- a/spec/features/admin/admin_hooks_spec.rb +++ b/spec/features/admin/admin_hooks_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Admin::Hooks" do +describe "Admin::Hooks", feature: true do before do @project = create(:project) login_as :admin diff --git a/spec/features/admin/admin_projects_spec.rb b/spec/features/admin/admin_projects_spec.rb index 23370891244..3b3d027ab75 100644 --- a/spec/features/admin/admin_projects_spec.rb +++ b/spec/features/admin/admin_projects_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Admin::Projects" do +describe "Admin::Projects", feature: true do before do @project = create(:project) login_as :admin diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb index 8d69b595aee..1aba40966c4 100644 --- a/spec/features/admin/admin_users_spec.rb +++ b/spec/features/admin/admin_users_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Admin::Users" do +describe "Admin::Users", feature: true do before { login_as :admin } describe "GET /admin/users" do diff --git a/spec/features/admin/security_spec.rb b/spec/features/admin/security_spec.rb index 6306832628b..21b0d8b965e 100644 --- a/spec/features/admin/security_spec.rb +++ b/spec/features/admin/security_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Admin::Projects" do +describe "Admin::Projects", feature: true do describe "GET /admin/projects" do subject { admin_projects_path } diff --git a/spec/features/atom/dashboard_issues_spec.rb b/spec/features/atom/dashboard_issues_spec.rb index 62f44690349..9fd2933b2cc 100644 --- a/spec/features/atom/dashboard_issues_spec.rb +++ b/spec/features/atom/dashboard_issues_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Dashboard Issues Feed" do +describe "Dashboard Issues Feed", feature: true do describe "GET /issues" do let!(:user) { create(:user) } let!(:project1) { create(:project) } diff --git a/spec/features/atom/dashboard_spec.rb b/spec/features/atom/dashboard_spec.rb index 6257ad5c895..e5d9f8ab5d5 100644 --- a/spec/features/atom/dashboard_spec.rb +++ b/spec/features/atom/dashboard_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Dashboard Feed" do +describe "Dashboard Feed", feature: true do describe "GET /" do let!(:user) { create(:user) } diff --git a/spec/features/atom/issues_spec.rb b/spec/features/atom/issues_spec.rb index c9bbdad380f..6ff03ec862c 100644 --- a/spec/features/atom/issues_spec.rb +++ b/spec/features/atom/issues_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Issues Feed" do +describe "Issues Feed", feature: true do describe "GET /issues" do let!(:user) { create(:user) } let!(:project) { create(:project) } diff --git a/spec/features/gitlab_flavored_markdown_spec.rb b/spec/features/gitlab_flavored_markdown_spec.rb index 07be6b81441..9f50d1c9738 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", features: true do +describe "GitLab Flavored Markdown", feature: 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/features/issues_spec.rb b/spec/features/issues_spec.rb index b9dab7846b1..e62517ad710 100644 --- a/spec/features/issues_spec.rb +++ b/spec/features/issues_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Issues" do +describe "Issues", feature: true do let(:project) { create(:project) } before do diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb index 25a86b11fa9..cfb6deb1834 100644 --- a/spec/features/notes_on_merge_requests_spec.rb +++ b/spec/features/notes_on_merge_requests_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "On a merge request", js: true do +describe "On a merge request", js: true, feature: true do let!(:merge_request) { create(:merge_request, :simple) } let!(:project) { merge_request.source_project } let!(:note) { create(:note_on_merge_request, :with_attachment, project: project) } diff --git a/spec/features/profile_spec.rb b/spec/features/profile_spec.rb index b67ce3c67f1..e8364bbb962 100644 --- a/spec/features/profile_spec.rb +++ b/spec/features/profile_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Profile account page" do +describe "Profile account page", feature: true do before(:each) { enable_observers } after(:each) {disable_observers} let(:user) { create(:user) } diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb index 9d5f9d5a2e2..1e24782c39a 100644 --- a/spec/features/projects_spec.rb +++ b/spec/features/projects_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Projects" do +describe "Projects", feature: true do before(:each) { enable_observers } after(:each) {disable_observers} before { login_as :user } diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb index 3ca59da493b..f12eb124296 100644 --- a/spec/features/search_spec.rb +++ b/spec/features/search_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Search" do +describe "Search", feature: true do before do ActiveRecord::Base.observers.enable(:user_observer) login_as :user diff --git a/spec/features/security/dashboard_access_spec.rb b/spec/features/security/dashboard_access_spec.rb index adec5926c6f..1cca82cef64 100644 --- a/spec/features/security/dashboard_access_spec.rb +++ b/spec/features/security/dashboard_access_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Dashboard access" do +describe "Dashboard access", feature: true do describe "GET /dashboard" do subject { dashboard_path } diff --git a/spec/features/security/group/group_access_spec.rb b/spec/features/security/group/group_access_spec.rb index c262d76ab54..b65e1d2dbf6 100644 --- a/spec/features/security/group/group_access_spec.rb +++ b/spec/features/security/group/group_access_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Group access" do +describe "Group access", feature: true do describe "GET /projects/new" do it { new_group_path.should be_allowed_for :admin } it { new_group_path.should be_allowed_for :user } diff --git a/spec/features/security/group/internal_group_access_spec.rb b/spec/features/security/group/internal_group_access_spec.rb index 79a6aee41b5..da5c6eb4e91 100644 --- a/spec/features/security/group/internal_group_access_spec.rb +++ b/spec/features/security/group/internal_group_access_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Group with internal project access" do +describe "Group with internal project access", feature: true do describe "Group" do let(:group) { create(:group) } diff --git a/spec/features/security/group/mixed_group_access_spec.rb b/spec/features/security/group/mixed_group_access_spec.rb index 028cd32d2bb..c9889d99590 100644 --- a/spec/features/security/group/mixed_group_access_spec.rb +++ b/spec/features/security/group/mixed_group_access_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Group access" do +describe "Group access", feature: true do describe "Group" do let(:group) { create(:group) } diff --git a/spec/features/security/group/public_group_access_spec.rb b/spec/features/security/group/public_group_access_spec.rb index f0ed7649eb5..2e76ab154ff 100644 --- a/spec/features/security/group/public_group_access_spec.rb +++ b/spec/features/security/group/public_group_access_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Group with public project access" do +describe "Group with public project access", feature: true do describe "Group" do let(:group) { create(:group) } diff --git a/spec/features/security/profile_access_spec.rb b/spec/features/security/profile_access_spec.rb index 078c257538f..4efc0ffdcd3 100644 --- a/spec/features/security/profile_access_spec.rb +++ b/spec/features/security/profile_access_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Users Security" do +describe "Users Security", feature: true do describe "Project" do before do @u1 = create(:user) diff --git a/spec/features/security/project/internal_access_spec.rb b/spec/features/security/project/internal_access_spec.rb index 152cf66dcfd..f6ab47ed91b 100644 --- a/spec/features/security/project/internal_access_spec.rb +++ b/spec/features/security/project/internal_access_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Internal Project Access" do +describe "Internal Project Access", feature: true do let(:project) { create(:project, :internal) } let(:master) { create(:user) } diff --git a/spec/features/security/project/private_access_spec.rb b/spec/features/security/project/private_access_spec.rb index 0402ff39735..8a0fcb8e9ff 100644 --- a/spec/features/security/project/private_access_spec.rb +++ b/spec/features/security/project/private_access_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Private Project Access" do +describe "Private Project Access", feature: true do let(:project) { create(:project) } let(:master) { create(:user) } diff --git a/spec/features/security/project/public_access_spec.rb b/spec/features/security/project/public_access_spec.rb index 7e6a39fad69..eb511bfefe0 100644 --- a/spec/features/security/project/public_access_spec.rb +++ b/spec/features/security/project/public_access_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Public Project Access" do +describe "Public Project Access", feature: true do let(:project) { create(:project) } let(:master) { create(:user) } diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb index ed9e44fb47e..7b831c48611 100644 --- a/spec/features/users_spec.rb +++ b/spec/features/users_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'Users' do +describe 'Users', feature: true do describe "GET /users/sign_up" do before do Gitlab.config.gitlab.stub(:signup_enabled).and_return(true) |