File tree 2 files changed +20
-15
lines changed
2 files changed +20
-15
lines changed Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ before_script:
29
29
- rake bundle:install
30
30
31
31
script :
32
- - SERVER=start TEST_CLUSTER_COMMAND=/usr/share/elasticsearch/bin/elasticsearch TEST_BUNDLE_GEMFILE=$TEST_BUNDLE_GEMFILE bundle exec rake test:all
32
+ - SERVER=launch TEST_CLUSTER_COMMAND=/usr/share/elasticsearch/bin/elasticsearch TEST_BUNDLE_GEMFILE=$TEST_BUNDLE_GEMFILE bundle exec rake test:all
33
33
34
34
notifications :
35
35
disable : true
Original file line number Diff line number Diff line change @@ -65,26 +65,31 @@ namespace :test do
65
65
desc "Run integration tests in all subprojects"
66
66
task :integration do
67
67
Rake ::Task [ 'test:ci_reporter' ] . invoke if ENV [ 'CI' ]
68
- subprojects . each do |project |
69
- puts '-' *80
70
- sh "cd #{ __current__ . join ( project ) } && unset BUNDLE_GEMFILE &&" +
71
- %Q| #{ ENV [ 'TEST_BUNDLE_GEMFILE' ] ? "BUNDLE_GEMFILE=#{ ENV [ 'TEST_BUNDLE_GEMFILE' ] } " : '' } | +
72
- " bundle exec rake test:integration"
73
- puts "\n "
74
- end
68
+
69
+ # 1/ elasticsearch-model
70
+ #
71
+ puts '-' *80
72
+ sh "cd #{ __current__ . join ( 'elasticsearch-model' ) } && unset BUNDLE_GEMFILE &&" +
73
+ %Q| #{ ENV [ 'TEST_BUNDLE_GEMFILE' ] ? "BUNDLE_GEMFILE=#{ ENV [ 'TEST_BUNDLE_GEMFILE' ] } " : '' } | +
74
+ " bundle exec rake test:integration"
75
+ puts "\n "
76
+
77
+ # 2/ elasticsearch-rails
78
+ #
79
+ puts '-' *80
80
+ sh "cd #{ __current__ . join ( 'elasticsearch-rails' ) } && unset BUNDLE_GEMFILE &&" +
81
+ " bundle exec rake test:integration"
82
+ puts "\n "
83
+
75
84
Rake ::Task [ 'test:coveralls' ] . invoke if ENV [ 'CI' ] && defined? ( RUBY_VERSION ) && RUBY_VERSION > '1.9'
76
85
end
77
86
78
87
desc "Run all tests in all subprojects"
79
88
task :all do
80
89
Rake ::Task [ 'test:ci_reporter' ] . invoke if ENV [ 'CI' ]
81
- subprojects . each do |project |
82
- puts '-' *80
83
- sh "cd #{ __current__ . join ( project ) } && unset BUNDLE_GEMFILE &&" +
84
- %Q| #{ ENV [ 'TEST_BUNDLE_GEMFILE' ] ? "BUNDLE_GEMFILE=#{ ENV [ 'TEST_BUNDLE_GEMFILE' ] } " : '' } | +
85
- " bundle exec rake test:all"
86
- puts "\n "
87
- end
90
+
91
+ Rake ::Task [ 'test:unit' ] . invoke
92
+ Rake ::Task [ 'test:integration' ] . invoke
88
93
end
89
94
90
95
task :coveralls do
You can’t perform that action at this time.
0 commit comments