diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-29 23:06:43 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-29 23:06:43 -0800 |
| commit | 23c31a0b12eaae7f7f25f30eca1066968bcb6059 (patch) | |
| tree | ac85bba9ffceb14af4aad670e7fe3e1b86ee01a4 | |
| parent | b7cf72f6eaad22a08081f4576447e52cebd5cf15 (diff) | |
| download | gitlab-ce-23c31a0b12eaae7f7f25f30eca1066968bcb6059.tar.gz | |
Skip tricky test for semaphore
| -rw-r--r-- | features/project/source/browse_files.feature | 2 | ||||
| -rw-r--r-- | lib/tasks/spinach.rake | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature index ccb29293a89..ec2aff4377d 100644 --- a/features/project/source/browse_files.feature +++ b/features/project/source/browse_files.feature @@ -24,7 +24,7 @@ Feature: Project Source Browse Files Given I click on "new file" link in repo Then I can see new file page - @javascript + @javascript @tricky Scenario: I can create and commit file Given I click on "new file" link in repo And I edit code diff --git a/lib/tasks/spinach.rake b/lib/tasks/spinach.rake index 507b315759d..ac885f315b9 100644 --- a/lib/tasks/spinach.rake +++ b/lib/tasks/spinach.rake @@ -2,9 +2,15 @@ Rake::Task["spinach"].clear if Rake::Task.task_defined?('spinach') desc "GITLAB | Run spinach" task :spinach do + tags = if ENV['SEMAPHORE'] + '~@tricky,~@wip' + else + '~@wip' + end + cmds = [ %W(rake gitlab:setup), - %W(spinach), + %W(spinach --tags #{tags}), ] run_commands(cmds) end |