Download as
Browse Code »

Commit c6adef89f9a60a5f8b6a8b4d77df7d28b9e2e07b

Authored by Weblate
2 parents 78a8ce85 2647f313
Exists in send_email_to_admins and in 5 other branches add_member_task_reject_details, fix_sign_up_form, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes

Merge remote-tracking branch 'origin/master'

Showing 4 changed files with 13 additions and 18 deletions   Show diff stats
@@ -29,11 +29,6 @@ addons: @@ -29,11 +29,6 @@ addons:
29 paths: 29 paths:
30 - $(ls tmp/artifact* | tr "\n" ":") 30 - $(ls tmp/artifact* | tr "\n" ":")
31 31
32 -# workaround for https://github.com/travis-ci/travis-ci/issues/4536  
33 -before_install:  
34 - - export GEM_HOME=$PWD/vendor/bundle/ruby/2.2.0  
35 - - gem install bundler  
36 -  
37 before_script: 32 before_script:
38 - mkdir -p tmp/{pids,cache} log cache 33 - mkdir -p tmp/{pids,cache} log cache
39 - script/noosfero-plugins disableall 34 - script/noosfero-plugins disableall
@@ -55,11 +50,11 @@ env: @@ -55,11 +50,11 @@ env:
55 - SLICE=2/4 TASK=selenium 50 - SLICE=2/4 TASK=selenium
56 - SLICE=3/4 TASK=selenium 51 - SLICE=3/4 TASK=selenium
57 - SLICE=4/4 TASK=selenium 52 - SLICE=4/4 TASK=selenium
58 - - SLICE=1/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install  
59 - - SLICE=2/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install  
60 - - SLICE=3/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install  
61 - - SLICE=4/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install  
62 - - SLICE=5/5 TASK=test:noosfero_plugins BUNDLE_OPTS=install 53 + - SLICE=1/5 TASK=test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
  54 + - SLICE=2/5 TASK=test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
  55 + - SLICE=3/5 TASK=test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
  56 + - SLICE=4/5 TASK=test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
  57 + - SLICE=5/5 TASK=test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
63 58
64 script: 59 script:
65 - bundle exec rake $TASK 60 - bundle exec rake $TASK
@@ -28,22 +28,22 @@ test: @@ -28,22 +28,22 @@ test:
28 bundle exec rake test:api 28 bundle exec rake test:api
29 bundle exec rake test:functionals 29 bundle exec rake test:functionals
30 SLICE=1/4 bundle exec rake selenium 30 SLICE=1/4 bundle exec rake selenium
31 - SLICE=1/4 BUNDLE_OPTS=install bundle exec rake test:noosfero_plugins 31 + SLICE=1/4 NOOSFERO_BUNDLE_OPTS=install bundle exec rake test:noosfero_plugins
32 ;; 32 ;;
33 1) 33 1)
34 bundle exec rake test:integration 34 bundle exec rake test:integration
35 SLICE=2/4 bundle exec rake selenium 35 SLICE=2/4 bundle exec rake selenium
36 - SLICE=2/4 BUNDLE_OPTS=install bundle exec rake test:noosfero_plugins 36 + SLICE=2/4 NOOSFERO_BUNDLE_OPTS=install bundle exec rake test:noosfero_plugins
37 ;; 37 ;;
38 2) 38 2)
39 bundle exec rake test:units 39 bundle exec rake test:units
40 SLICE=3/4 bundle exec rake selenium 40 SLICE=3/4 bundle exec rake selenium
41 - SLICE=3/4 BUNDLE_OPTS=install bundle exec rake test:noosfero_plugins 41 + SLICE=3/4 NOOSFERO_BUNDLE_OPTS=install bundle exec rake test:noosfero_plugins
42 ;; 42 ;;
43 3) 43 3)
44 bundle exec rake cucumber 44 bundle exec rake cucumber
45 SLICE=4/4 bundle exec rake selenium 45 SLICE=4/4 bundle exec rake selenium
46 - SLICE=4/4 BUNDLE_OPTS=install bundle exec rake test:noosfero_plugins 46 + SLICE=4/4 NOOSFERO_BUNDLE_OPTS=install bundle exec rake test:noosfero_plugins
47 ;; 47 ;;
48 esac 48 esac
49 : 49 :
lib/tasks/plugins_tests.rake
  Diff comments   View file @c6adef8
@@ -25,7 +25,7 @@ def enable_plugins(plugins) @@ -25,7 +25,7 @@ def enable_plugins(plugins)
25 plugins = Array(plugins) 25 plugins = Array(plugins)
26 command = ['./script/noosfero-plugins', '-q', 'enable', *plugins] 26 command = ['./script/noosfero-plugins', '-q', 'enable', *plugins]
27 puts plugins.join(' ') 27 puts plugins.join(' ')
28 - system *command 28 + Bundler.clean_system *command
29 end 29 end
30 30
31 def disable_plugins(plugins = '*') 31 def disable_plugins(plugins = '*')
script/noosfero-plugins
  Diff comments   View file @c6adef8
@@ -79,7 +79,7 @@ run(){ @@ -79,7 +79,7 @@ run(){
79 79
80 _install(){ 80 _install(){
81 # export so that recursive enables for dependencies inherit this option too 81 # export so that recursive enables for dependencies inherit this option too
82 - export BUNDLE_OPTS='install' 82 + export NOOSFERO_BUNDLE_OPTS='install'
83 _enable "$1" 83 _enable "$1"
84 } 84 }
85 85
@@ -119,8 +119,8 @@ _enable(){ @@ -119,8 +119,8 @@ _enable(){
119 if [ -e $source/Gemfile ]; then 119 if [ -e $source/Gemfile ]; then
120 gemfile=$(mktemp --tmpdir=.) 120 gemfile=$(mktemp --tmpdir=.)
121 cat $NOOSFERO_DIR/Gemfile $source/Gemfile > $gemfile 121 cat $NOOSFERO_DIR/Gemfile $source/Gemfile > $gemfile
122 - if [ -z "$BUNDLE_OPTS" ]; then BUNDLE_OPTS="--local"; fi  
123 - if ! RUBYOPT='' BUNDLE_GEMFILE="$gemfile" bundle $BUNDLE_OPTS --quiet; then 122 + if [ -z "$NOOSFERO_BUNDLE_OPTS" ]; then NOOSFERO_BUNDLE_OPTS="--local"; fi
  123 + if ! RUBYOPT='' BUNDLE_GEMFILE="$gemfile" bundle $NOOSFERO_BUNDLE_OPTS --quiet; then
124 dependencies_ok=false 124 dependencies_ok=false
125 else 125 else
126 mv "$gemfile".lock Gemfile.lock 126 mv "$gemfile".lock Gemfile.lock