Rakefile in blacklight-spotlight-3.5.0.4 vs Rakefile in blacklight-spotlight-3.6.0.beta1

@@ -32,14 +32,14 @@
 
 task ci: ['engine_cart:generate'] do
   ENV['environment'] = 'test'
 
   SolrWrapper.wrap(port: '8983') do |solr|
-    solr.with_collection(name: 'blacklight-core', dir: File.join(__dir__, 'solr_conf', 'conf')) do
+    solr.with_collection(name: 'blacklight-core', dir: 'lib/generators/spotlight/templates/solr/conf') do
       within_test_app do
         system 'bundle install'
-        system 'bundle exec rake db:migrate'
+        system 'bin/rails db:migrate'
       end
 
       Rake::Task['spotlight:fixtures'].invoke
 
       # run the tests
@@ -60,18 +60,17 @@
   desc 'Start the test application for Spotlight'
   task :server do
     Rake::Task['engine_cart:generate'].invoke
 
     SolrWrapper.wrap(port: '8983') do |solr|
-      solr.with_collection(name: 'blacklight-core', dir: File.join(__dir__, 'solr_conf', 'conf')) do
+      solr.with_collection(name: 'blacklight-core', dir: 'lib/generators/spotlight/templates/solr/conf') do
         within_test_app do
           unless File.exist? '.initialized'
-            system 'bundle exec rake spotlight:initialize'
-            system 'bundle exec rake spotlight_test:solr:seed'
+            system 'bin/rails spotlight:initialize spotlight_test:solr:seed'
             File.open('.initialized', 'w') {}
           end
-          system 'bundle exec rails s'
+          system 'bin/rails s'
         end
       end
     end
   end
 
@@ -102,10 +101,10 @@
             Bundler.with_clean_env do
               Dir.chdir('internal') do
                 APP_ROOT = Dir.pwd
                 SolrWrapper.wrap(port: '8983') do |solr|
                   solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path('..', File.dirname(__FILE__)), 'solr', 'conf')) do
-                    system 'bundle exec rails s'
+                    system 'bin/rails s'
                   end
                 end
               end
             end
           end