geoblacklight 4.4.2 → 5.0.0.pre.alpha.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6820d2f267605af373b65ad7bb940b1787eea36cb85ebde3a75d0ba198a5bb24
-  data.tar.gz: f2e9a5800739987386f67d4e9b248175102d5c347b42d05c80e754f567c11cb8
+  metadata.gz: 0e2b959de4c55a7527ad4d7687af25f972a6e219f94dc0ec8b7fb9c76154d5ee
+  data.tar.gz: 99cba751fbb1f088a2f96e40c64998e77e07bccb50511508fa57da35c8cb38a2
 SHA512:
-  metadata.gz: 7247b6f2706fe1e9b857a745b43efccddd4b05e93632afa1030ab76af71606759439a90830c03df5e637979e5c4dd68fe8f56fd1790cf7f3971119b0f03799e6
-  data.tar.gz: 7c2aaf7bc4c748a6afb5b943d3f908d1f8dd465d27d065a115ef45665a671d2c20e8d0ba8d9ae4c86383e8011fc64fa0dbdd9aeeb6ea379aa3566af9d8be7b54
+  metadata.gz: f98c1fd49c6dd1c0718a22dab3fea41457f54844415cf1003b36e5a14f6584eabb91061e52bdd7cf4224deadb4557d78125d90d06f15c74b808a1acff3bd9716
+  data.tar.gz: 1d716078cca8102a668cbb9ac1e6d987b9837f9428ffcc2ec51aa7f6986681fa169200e2f0e9fe5916ba187705e154d78189e82009cf5d4ddec2148385fa0d5a

data/.github/workflows/build-demo-app.yml

@@ -0,0 +1,153 @@
+name: Build demo app
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: "0 1 * * SUN"  # every sunday at 1AM
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+  BRANCH: ${{ github.head_ref || github.ref_name }}
+
+jobs:
+  build-app:
+    runs-on: ubuntu-latest
+    outputs:
+      artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3.4
+
+      - name: Install dependencies
+        run: bundle install
+        env:
+          RAILS_VERSION: 7.1.3
+
+      - name: Setup Yarn
+        run: exec "yarnpkg"
+
+      - name: Build
+        run: BRANCH=${{ env.BRANCH }} rails new build -m template.rb -a propshaft
+
+      - name: Cleanup
+        run: rm -rf build/node_modules build/Gemfile.lock build/yarn.lock build/tmp
+
+      - name: Copy Dockerfile
+        run: cp lib/generators/geoblacklight/templates/demo-app/Dockerfile build/.
+
+      - name: Copy demo-app compose.yml
+        run: cp -f lib/generators/geoblacklight/templates/demo-app/compose.yml build/.
+
+      - name: Copy start-server script
+        run: cp lib/generators/geoblacklight/templates/demo-app/start-server.sh build/.
+
+      - name: Copy fixture solr documents
+        run:  mkdir -p build/spec/fixtures && cp -R spec/fixtures/solr_documents build/spec/fixtures/.
+
+      - name: Replace main image tag with pr tag
+        if: github.ref_name != 'main'
+        run: sed -i 's/main/pr-${{ github.event.number }}/g'  build/compose.yml
+
+      - name: Upload app build
+        uses: actions/upload-artifact@v4
+        id: artifact-upload-step
+        with:
+          name: build-${{ env.BRANCH }}
+          path: build/
+
+  build-docker:
+    runs-on: ubuntu-latest
+    needs:
+      - build-app
+    steps:
+      - name: Download app build
+        uses: actions/download-artifact@v4
+        with:
+          name: build-${{ env.BRANCH }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=sha
+        env:
+          DOCKER_METADATA_PR_HEAD_SHA: true
+
+        # Rebuild base context when triggered by schedule or workflow_dispatch
+      - name: Build and push base Docker image
+        uses: docker/build-push-action@v6
+        if: github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'
+        with:
+          context: "${{ github.workspace }}"
+          file: "${{ github.workspace }}/Dockerfile"
+          push: true
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ghcr.io/geoblacklight/geoblacklight:base
+          target: "base"
+
+        # Build only the app context. Build times are faster because most
+        # gems and node packages are already installed in the base context.
+      - name: Build and push branch Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: "${{ github.workspace }}"
+          file: "${{ github.workspace }}/Dockerfile"
+          push: true
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          target: "app"
+
+  notify:
+    runs-on: ubuntu-latest
+    if: github.ref_name != 'main'
+    needs:
+      - build-app
+      - build-docker
+    permissions:
+      contents: read
+      packages: write
+      pull-requests: write
+    steps:
+      - name: Add artifact link to PR comments
+        uses: mshick/add-pr-comment@v2
+        with:
+          message: |
+            Demo app download link: ${{ needs.build-app.outputs.artifact-url }}
+
+            1. Download demo app and unzip file
+            2. Change into app directory
+                - run `docker compose pull`
+                - run `docker compose up`
+            3. Open in browser
+                - App:  http://127.0.0.1:3001
+                - Solr: http://127.0.0.1:8984

data/.github/workflows/prune-containers.yml

@@ -0,0 +1,19 @@
+name: Prune containers
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * SUN"  # every sunday at midnight
+
+jobs:
+  clean:
+    runs-on: ubuntu-latest
+    name: Delete old images
+    steps:
+      - uses: snok/container-retention-policy@v3.0.0
+        with:
+          account: geoblacklight
+          image-names: geoblacklight
+          token: ${{ secrets.GITHUB_TOKEN }}
+          image-tags: "!main !base"
+          cut-off: 2w

data/.github/workflows/ruby.yml

@@ -10,66 +10,68 @@ jobs:
   linter:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-    - name: Install dependencies
-      run: bundle install
-    - name: Run linter
-      run: bundle exec standardrb
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+      - name: Install dependencies
+        run: bundle install
+      - name: Run linter
+        run: bundle exec standardrb
 
   aardvark-fixture-linter:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-    - name: Install json schema validator
-      run: gem install json_schemer
-    - name: Run json_schemer against aarkvark fixtures
-      run: find spec/fixtures/solr_documents -type f -name "*.json" | xargs json_schemer schema/geoblacklight-schema-aardvark.json
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+      - name: Install json schema validator
+        run: gem install json_schemer
+      - name: Run json_schemer against aarkvark fixtures
+        run: find spec/fixtures/solr_documents -type f -name "*.json" | xargs json_schemer schema/geoblacklight-schema-aardvark.json
 
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: ['3.2', '3.3']
-        rails_version: [6.1.7.6, 7.1.3, 7.2.0]
+        ruby_version: ["3.2", "3.3"]
+        rails_version: ["7.0.8.4", "7.1.3.4", "7.2.0"]
+        asset_pipeline: ["vite"]
+        additional_engine_cart_rails_options: [""]
+        # this build has failing tests that aren't easy to replicate locally
+        # https://github.com/geoblacklight/geoblacklight/issues/1585
+        # include:
+        #   - ruby_version: "3.2"
+        #     rails_version: "7.1.3.4"
+        #     additional_engine_cart_rails_options: "--css bootstrap"
+        #     asset_pipeline: "importmap"
 
-    name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }}
+    name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }} / ${{ matrix.asset_pipeline }}
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby_version }}
-    - name: Create Solr container
-      run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
-    - name: Install dependencies
-      run: bundle install
-      env:
-        RAILS_VERSION: ${{ matrix.rails_version }}
-    - name: Setup Yarn
-      run: exec "yarnpkg"
-    - name: Load config into solr
-      run: |
-          cd solr/conf
-          zip -1 -r solr_config.zip ./*
-          curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://solr:SolrRocks@127.0.0.1:8983/solr/admin/configs?action=UPLOAD&name=blacklight"
-          curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8983/api/collections/  -d '{create: {name: blacklight-core, config: blacklight, numShards: 1}}'
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        RAILS_VERSION: ${{ matrix.rails_version }}
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test --skip-webpack-install --skip-javascript'
-        SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
-    - name: Upload coverage artifacts
-      uses: actions/upload-artifact@v2
-      if: always()
-      with:
-        name: coverage
-        path: coverage/
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+      - name: Install dependencies
+        run: bundle install
+        env:
+          RAILS_VERSION: ${{ matrix.rails_version }}
+      - name: Setup Yarn
+        run: exec "yarnpkg"
+      - name: Run tests
+        run: bundle exec rake ci
+        env:
+          RAILS_VERSION: ${{ matrix.rails_version }}
+          ASSET_PIPELINE: ${{ matrix.asset_pipeline }}
+          ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-keeps --skip-action-cable --skip-test -a propshaft ${{ matrix.additional_engine_cart_rails_options }}"
+          SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
+      - name: Upload coverage artifacts
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: "coverage-${{ matrix.ruby_version }}-${{ matrix.rails_version }}"
+          path: coverage/

data/.gitignore

@@ -28,6 +28,7 @@ jetty
 yarn-debug.log*
 .yarn-integrity
 yarn.lock
+package-lock.json
 
 # Ignore IDE files
 .idea
@@ -36,8 +37,7 @@ yarn.lock
 /public/vite*
 /public/geoblacklight-vite*
 node_modules
-dist
+app/assets/javascripts/geoblacklight
 # Vite uses dotenv and suggests to ignore local-only env files. See
 # https://vitejs.dev/guide/env-and-mode.html#env-files
 *.local
-

data/CONTRIBUTING.md

@@ -1,49 +1,67 @@
-## Contributing
-GeoBlacklight is a collaborative open source projects where contributions are :sparkles:welcome:sparkles:. This contributing guide is borrowed in part from the [Samvera Contributing Guide](https://github.com/samvera/hydra/blob/master/CONTRIBUTING.md) and the [Blacklight Contributing Wiki](https://github.com/projectblacklight/blacklight/wiki/Contributing-to-Blacklight).
+# GeoBlacklight Codebase Contribution Guide
+GeoBlacklight is a collaborative, open source project where contributions are :sparkles:welcome:sparkles:.
 
 ### Who can contribute?
-**Anyone** is welcome to contribute to GeoBlacklight. We follow a set of contribution practices to maintain a technically sustainable and stable software project for everyone.
+**Anyone** is welcome to contribute to GeoBlacklight. We follow a set of contribution practices to maintain a technically sustainable and stable software project for everyone. We expect all contributors to adhere to our [Code of Conduct](https://github.com/geoblacklight/geoblacklight/blob/main/CODE_OF_CONDUCT.md).
 
-### Reporting issues
-Did you find a bug in GeoBlacklight or interested in a new feature? Make sure to add an issue for it in the [issue tracker](https://github.com/geoblacklight/geoblacklight/issues).
+### Join the community
+See the [community page](https://geoblacklight.org/community/) on our website for information about our community calendar, slack, volunteer opportunities, and more.
+
+If you have questions or want to get more involved, join [GeoBlacklight Slack](https://geoblacklight.slack.com/join/shared_invite/zt-1p7dcay40-Ye_WTt5_iCqU8rDjzhkoWw#/shared-invite/email) or email the [GeoBlacklight Community](https://groups.google.com/g/geoblacklight-community) at [geoblacklight-community@googlegroups.com](mailto:geoblacklight-community@googlegroups.com).
+
+## Issues
+Issues are used in the GeoBlacklight community as a convenient way to document bugs, propose new functionality and enhancements, and discuss important code changes.
+
+### Creating an issue
+Did you find a bug in GeoBlacklight? Looking to suggest a new feature? Add an issue for it in the [issue tracker](https://github.com/geoblacklight/geoblacklight/issues). 
 
  - Make sure you have a [GitHub account](https://github.com/signup/free)
- - Submit a [GitHub issue](./issues) by:
-    - Clearly describing the issue
-    - Provide a descriptive summary
-    - Explain the expected behavior
-    - Explain the actual behavior
-    - Provide steps to reproduce the actual behavior
-
-### GeoBlacklight Software Versioning
-GeoBlacklight follows the practice of [Semantic Versioning](https://semver.org/) for software releases. The declared semantically versioned public API includes:
- - the GeoBlacklight-Schema
- - the [public GeoBlacklight Ruby codebase classes](http://www.rubydoc.info/github/geoblacklight/geoblacklight/master/frames)
- - the GeoBlacklight JavaScript interface
- - the GeoBlacklight view interface
-
-### Contributing code or documentation
-GeoBlacklight welcomes code and documentation contributions. You do *not* need to be a "GeoBlacklight Committer" to contribute code or documentation. We follow the [pull request](https://help.github.com/articles/using-pull-requests/) model for contributing on GitHub. GeoBlacklight uses a suite of tests to express its features and protect from bugs:bug:.
-
-When proposing major new features or changes that may introduce an API or schema change, please make sure to communicate with the [community](http://geoblacklight.org/connect) so the full implications are understood. Likely there are ways to introduce these changes in a backwards compatible way that others may be able to help with.
-
-#### Pull request overview
-1. Fork it ( http://github.com/my-github-username/geoblacklight/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-#### Merging Changes
-
-- It is considered "poor form" to merge your own request.
-- Please take the time to review the changes and get a sense of what is being changed. Things to consider:
-  - Does the commit message explain what is going on?
-  - Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
-  - Do all new methods, modules, and classes have comments? Do changed methods, modules, and classes have comments?
-  - Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
-  - Did the Travis tests complete successfully?
-- If you are uncertain, bring other contributors into the conversation by creating a comment that includes their @username.
-- If you like the pull request, but want others to chime in, create a +1 comment and tag a user.
-
-If you wish to ask questions or participate further, email the [GeoBlacklight Working Group](https://groups.google.com/forum/#!forum/geoblacklight-working-group) at [geoblacklight-working-group@googlegroups.com](mailto:geoblacklight-working-group@googlegroups.com).
+ - Submit a new issue that:
+    - Clearly describes the issue
+    - Provides a descriptive summary
+    - Explains the expected behavior
+    - Explains the actual behavior
+    - Provides steps to reproduce the actual behavior
+
+### Assigning an issue
+
+In the GeoBlacklight community, issue assignment helps signal who is interested in working on an issue or who can assist in moving it forward. If you find an issue you’d like to contribute to, you can assign yourself to it. If an issue is already assigned, you are still welcome to contribute or provide support. Active issues will be marked with a status of “In progress” on our Project boards.
+
+## Contributing to the codebase
+GeoBlacklight welcomes code contributions. You do *not* need to be a "GeoBlacklight Committer" to contribute code or documentation. We follow the [pull request](https://help.github.com/articles/using-pull-requests/) model for contributing on GitHub. GeoBlacklight uses a suite of tests to express its features and protect from bugs :bug:.
+
+When proposing major new features or changes that may introduce an API or schema change, please make sure to communicate with the [community](https://geoblacklight.org/community/) so the full implications are understood. Likely there are ways to introduce these changes in a backwards compatible way that others may be able to help with.
+
+To contribute to our website or documentation pages, see the [GeoBlacklight Website Contribution Guide](https://github.com/geoblacklight/geoblacklight.github.io/blob/main/CONTRIBUTING.md).
+
+### Pull request overview
+Given the multi-institutional nature of the project, communitiy code review is important. **We discourage individuals from merging their own requests.** We also prefer that developers from the same institutions do not merge their colleagues code.
+
+**Contributors:**
+
+1. If there isn't already an associated issue in the repository, create one
+1. Clone or fork the geoblacklight repository
+1. Create a new feature branch and publish it
+1. Make changes to the files
+1. Commit your changes
+1. Push to the new branch
+1. Open a Pull Request to the appropriate branch, like **main**, **release-4.x**, etc.
+1. If you want specific others to chime in, create a +1 comment and tag them. You can tag the [GeoBlacklight Developers](#who-are-the-geoblacklight-developers) with their @username: `@geoblacklight/geoblacklight-developers`
+1. Add the GeoBlacklight Developers team as a requested reviewer
+1. Mention the pull request in the associated issue
+
+**Reviewers:**
+
+1. Review the Pull Request
+1. Merge changes to the appropriate branch
+
+### Tips for contributions
+Please take the time to review the changes you made. Make sure that:
+- New and changed code has comments
+- The commit summary explains what has been changed
+- Each commit addresses just a single concern
+- If your code requires testing, you wrote a new test for it
+- The GitHub Actions CI tests completed successfully
+
+### Who are the GeoBlacklight Developers?
+The [GeoBlacklight Developers](https://github.com/orgs/geoblacklight/teams/geoblacklight-developers) team consists of contributors with GitHub privileges to review and merge pull requests (PRs) for the GeoBlacklight project. This team brings together individuals with varying types of expertise, including experience in the codebase, documentation, metadata, GIS data, and web services. If you have any questions or need guidance, this team or its individual members are a great starting point. When you submit a PR, a member of this team will review it and, if appropriate, merge it into the project.

data/Gemfile

@@ -3,28 +3,9 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in geoblacklight.gemspec
 gemspec
 
-group :development, :test do
-  # See https://github.com/rails/rails/issues/32955
-  gem "thor", ">= 0.19.0"
-end
-
-group :test do
-  gem "capybara", require: false
-  gem "database_cleaner", require: false
-  gem "engine_cart", require: false
-  gem "factory_bot_rails", require: false
-  gem "foreman", require: false
-  gem "rails-controller-testing", require: false
-  gem "rspec-rails", require: false
-  gem "simplecov", require: false
-  gem "standardrb", require: false
-  gem "webdrivers", require: false
-  gem "webmock", require: false
-end
-
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.10.0
-# engine_cart stanza: 0.10.0
+# engine_cart: 2.6.0
+# engine_cart stanza: 2.5.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
 file = File.expand_path("Gemfile", ENV["ENGINE_CART_DESTINATION"] || ENV["RAILS_ROOT"] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
 if File.exist?(file)
@@ -40,16 +21,10 @@ else
   if ENV["RAILS_VERSION"]
     if ENV["RAILS_VERSION"] == "edge"
       gem "rails", github: "rails/rails"
-      ENV["ENGINE_CART_RAILS_OPTIONS"] = "--edge --skip-turbolinks"
+      ENV["ENGINE_CART_RAILS_OPTIONS"] = "--edge"
     else
       gem "rails", ENV["RAILS_VERSION"]
     end
   end
 end
-
-if File.exist?("spec/test_app_templates/Gemfile.extra")
-  # rubocop:disable Security/Eval
-  eval File.read("spec/test_app_templates/Gemfile.extra"), nil, "spec/test_app_templates/Gemfile.extra"
-  # rubocop:enable Security/Eval
-end
 # END ENGINE_CART BLOCK

data/Rakefile

@@ -8,10 +8,29 @@ rescue LoadError
   puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-require "solr_wrapper"
-require "solr_wrapper/rake_task"
 require "engine_cart/rake_task"
 require "rspec/core/rake_task"
+require "open3"
+
+# Ensure the app generates with Propshaft; sprockets is no longer supported
+# https://github.com/geoblacklight/geoblacklight/issues/1265
+ENV["ENGINE_CART_RAILS_OPTIONS"] = ENV["ENGINE_CART_RAILS_OPTIONS"].to_s + " -a propshaft"
+
+def system_with_error_handling(*args)
+  Open3.popen3(*args) do |_stdin, stdout, stderr, thread|
+    puts stdout.read
+    raise "Unable to run #{args.inspect}: #{stderr.read}" unless thread.value.success?
+  end
+end
+
+def with_solr(&block)
+  puts "Starting Solr"
+  system_with_error_handling "docker compose up -d solr"
+  yield
+ensure
+  puts "Stopping Solr"
+  system_with_error_handling "docker compose stop solr"
+end
 
 task(:spec).clear
 RSpec::Core::RakeTask.new(:spec) do |t|
@@ -24,16 +43,16 @@ task :javascript_tests do
 end
 
 desc "Run test suite"
-task ci: ["geoblacklight:generate"] do
-  within_test_app do
-    system "RAILS_ENV=test rake geoblacklight:index:seed"
-  end
+task :ci do
+  with_solr do
+    Rake::Task["geoblacklight:internal:seed"].invoke
 
-  # Run RSpec tests with Coverage
-  Rake::Task["geoblacklight:coverage"].invoke
+    # Run RSpec tests with Coverage
+    Rake::Task["geoblacklight:coverage"].invoke
 
-  # Run JavaScript tests
-  Rake::Task["javascript_tests"].invoke
+    # Run JavaScript tests
+    Rake::Task["javascript_tests"].invoke
+  end
 end
 
 namespace :geoblacklight do
@@ -43,11 +62,6 @@ namespace :geoblacklight do
     Rake::Task["spec"].invoke
   end
 
-  desc "Create the test rails app"
-  task generate: ["engine_cart:generate"] do
-    # Intentionally Empty Block
-  end
-
   namespace :internal do
     task seed: ["engine_cart:generate"] do
       within_test_app do
@@ -57,66 +71,27 @@ namespace :geoblacklight do
     end
   end
 
-  desc "Run Solr and GeoBlacklight for interactive development"
+  desc "Run GeoBlacklight and Solr with seed data for interactive development"
   task :server, [:rails_server_args] do |_t, args|
-    if File.exist? EngineCart.destination
-      within_test_app do
-        system "bundle update"
-      end
-    else
-      Rake::Task["engine_cart:generate"].invoke
-    end
+    with_solr do
+      Rake::Task["geoblacklight:internal:seed"].invoke
 
-    SolrWrapper.wrap(port: "8983") do |solr|
-      solr.with_collection(name: "blacklight-core", dir: File.join(File.expand_path(".", File.dirname(__FILE__)), "solr", "conf")) do
-        Rake::Task["geoblacklight:internal:seed"].invoke
-
-        within_test_app do
-          puts "\nSolr server running: http://localhost:#{solr.port}/solr/#/blacklight-core"
-          puts "\n^C to stop"
-          puts " "
-          begin
-            system "bundle exec rails s #{args[:rails_server_args]}"
-          rescue Interrupt
-            puts "Shutting down..."
-          end
+      within_test_app do
+        puts "Starting GeoBlacklight (Rails server)"
+        puts " "
+        begin
+          system "bundle exec rails s #{args[:rails_server_args]}"
+        rescue Interrupt
+          puts "Shutting down..."
         end
       end
     end
-  end
 
-  desc "Run Solr and seed with sample data"
-  task :solr do
-    if File.exist? EngineCart.destination
+    desc "Stdout output asset paths"
+    task :asset_paths do
       within_test_app do
-        system "bundle update"
+        system "bundle exec rake geoblacklight:application_asset_paths"
       end
-    else
-      Rake::Task["engine_cart:generate"].invoke
-    end
-
-    SolrWrapper.wrap(port: "8983") do |solr|
-      solr.with_collection(name: "blacklight-core", dir: File.join(File.expand_path(".", File.dirname(__FILE__)), "solr", "conf")) do
-        Rake::Task["geoblacklight:internal:seed"].invoke
-
-        within_test_app do
-          puts "\nSolr server running: http://localhost:#{solr.port}/solr/#/blacklight-core"
-          puts "\n^C to stop"
-          puts " "
-          begin
-            sleep
-          rescue Interrupt
-            puts "Shutting down..."
-          end
-        end
-      end
-    end
-  end
-
-  desc "Stdout output asset paths"
-  task :asset_paths do
-    within_test_app do
-      system "bundle exec rake geoblacklight:application_asset_paths"
     end
   end
 end