[Git][noosfero/noosfero][master] 2 commits: gitignore.example: ignore a local initializer file

[Antonio Terceiro]

Antonio Terceiro pushed to branch master at Noosfero / noosfero


Commits:
aece445a by Antonio Terceiro at 2015-11-10T11:18:51Z
gitignore.example: ignore a local initializer file

- - - - -
bf2cbbd3 by Antonio Terceiro at 2015-11-10T15:18:27Z
Fix behaviour of `rake`

For some bizarre reason no tests would run when the :cucumber task is
added as a dependency of :default (??).

Also let's stop messing with the dependencies of the test task; the task
to run all tests (as in ci.noosfero.org) is now ci:full

- - - - -


3 changed files:

- gitignore.example
- lib/tasks/cucumber.rake
- lib/tasks/test.rake


Changes:

=====================================
gitignore.example
=====================================
--- a/gitignore.example
+++ b/gitignore.example
@@ -12,6 +12,7 @@ config/mongrel_cluster.yml
 config/plugins
 config/unicorn.rb
 config/local.rb
+config/initializers/local.rb
 index
 locale
 log


=====================================
lib/tasks/cucumber.rake
=====================================
--- a/lib/tasks/cucumber.rake
+++ b/lib/tasks/cucumber.rake
@@ -44,8 +44,6 @@ begin
   desc 'Alias for cucumber:ok'
   task :cucumber => 'cucumber:ok'
 
-  task :default => :cucumber
-
   task :features => :cucumber do
     STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
   end


=====================================
lib/tasks/test.rake
=====================================
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -1,11 +1,3 @@
-t = Rake::Task[:test]
-if t.respond_to?(:clear)
-  t.clear
-else
-  t.prerequisites.clear
-  t.instance_variable_get('@actions').clear
-end
-
 desc 'Runs Seleniun acceptance tests'
 task :selenium do
   sh "xvfb-run -a cucumber -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
@@ -16,7 +8,7 @@ CucumberTasks = %w(cucumber selenium)
 NoosferoTasks = %w(test:noosfero_plugins)
 AllTasks = TestTasks + CucumberTasks + NoosferoTasks
 
-task :test do
+task 'ci:full' do
   data = []
   failed = []
   AllTasks.each do |task|



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/e372474dd84697258518f38656029c8982d30e08...bf2cbbd3dc1867b9aecf86a721f19701191c9909
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20151110/32e4def9/attachment.html>