summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandx <dmitriy.zaporozhets@gmail.com>2012-06-17 18:33:13 +0300
committerrandx <dmitriy.zaporozhets@gmail.com>2012-06-17 18:33:13 +0300
commitcd3f55a310546151a82ac48abcfcdc8da2740b7e (patch)
tree481b9ecb43279cd842489c8b472d3c0808426c1f
parentdbc7ef21d1ff264011d5bd4df2faf4ce6870645c (diff)
downloadgitlab-ce-cd3f55a310546151a82ac48abcfcdc8da2740b7e.tar.gz
Fix travis
-rw-r--r--features/step_definitions/commits_steps.rb11
-rw-r--r--lib/tasks/travis.rake2
2 files changed, 12 insertions, 1 deletions
diff --git a/features/step_definitions/commits_steps.rb b/features/step_definitions/commits_steps.rb
index 9f7b2a16361..b4c67128204 100644
--- a/features/step_definitions/commits_steps.rb
+++ b/features/step_definitions/commits_steps.rb
@@ -48,3 +48,14 @@ Given /^I see compared refs$/ do
page.should have_content "Showing 73 changed files"
end
+Given /^I visit project branches page$/ do
+ pending # express the regexp above with the code you wish you had
+end
+
+Given /^I visit project commit page$/ do
+ pending # express the regexp above with the code you wish you had
+end
+
+Given /^I visit project tags page$/ do
+ pending # express the regexp above with the code you wish you had
+end
diff --git a/lib/tasks/travis.rake b/lib/tasks/travis.rake
index f5c7ab9cae7..c0b63194a77 100644
--- a/lib/tasks/travis.rake
+++ b/lib/tasks/travis.rake
@@ -1,5 +1,5 @@
task :travis do
- ["rspec spec", "rake cucumber"].each do |cmd|
+ ["bundle exec rake cucumber", "bundle exec rspec spec"].each do |cmd|
puts "Starting to run #{cmd}..."
system("export DISPLAY=:99.0 && bundle exec #{cmd}")
raise "#{cmd} failed!" unless $?.exitstatus == 0