test: Correct Rails 7 integration test to work with jruby-rack 1.2.x

Author: chadlwilson

.gitignore

@@ -16,4 +16,4 @@ integration/**/*.iml
 build.log
 .ruby-version
 .rspec_status
-/integration/rails7_test/src/main/ruby/db/*.sqlite3*
+*.sqlite3-*

integration/pom.xml

@@ -149,33 +149,26 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.mortbay.jetty</groupId>
+          <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-maven-plugin</artifactId>
           <version>${jetty.version}</version>
           <configuration>
             <webAppConfig>
               <contextPath>/</contextPath>
-              <configurationClasses>
-                <configurationClass>org.eclipse.jetty.webapp.WebXmlConfiguration</configurationClass>
-                <configurationClass>org.eclipse.jetty.webapp.WebInfConfiguration</configurationClass>
-                <configurationClass>org.eclipse.jetty.webapp.TagLibConfiguration</configurationClass>
-                <configurationClass>org.eclipse.jetty.webapp.MetaInfConfiguration</configurationClass>
-                <configurationClass>org.eclipse.jetty.webapp.FragmentConfiguration</configurationClass>
-                <configurationClass>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</configurationClass>
-                <!-- intentionally no AnnotationConfiguration -->
-              </configurationClasses>
             </webAppConfig>
             <stopPort>9966</stopPort>
             <stopKey>warbler_stop</stopKey>
             <scanIntervalSeconds>0</scanIntervalSeconds>
             <daemon>true</daemon>
+            <supportedPackagings>jar</supportedPackagings>
           </configuration>
           <executions>
             <execution>
               <id>start-jetty</id>
               <phase>pre-integration-test</phase>
               <goals>
-                <goal>run-war</goal>
+                <!-- Change to run-war to interactively play with the server without running tests -->
+                <goal>deploy-war</goal>
               </goals>
             </execution>
             <execution>

integration/rails7_test/pom.xml

@@ -9,8 +9,6 @@
   </parent>
 
   <artifactId>rails7_test</artifactId>
-  <packaging>pom</packaging>
-
   <name>rails7_test</name>
 
   <build>
@@ -30,7 +28,7 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.mortbay.jetty</groupId>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <executions>
           <execution>

integration/rails7_test/src/main/ruby/Gemfile

@@ -1,9 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '7.1.5.1'
-
-gem 'puma'
+gem 'rails', '~> 7.1.0'
+gem 'rack', '~> 2.2.19'
 
 gem 'activerecord-jdbcsqlite3-adapter', '~> 71.0'
-
-gem 'jbuilder'

integration/rails7_test/src/main/ruby/config/environments/development.rb

@@ -17,6 +17,9 @@
   # Enable server timing
   config.server_timing = true
 
+  # Workaround https://github.com/jruby/jruby-rack/issues/329
+  config.logger = ActiveSupport::Logger.new(STDOUT)
+
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
   if Rails.root.join("tmp/caching-dev.txt").exist?

integration/rails7_test/src/main/ruby/config/warble.rb

@@ -1,4 +1,6 @@
 Warbler::Config.new do |config|
   config.autodeploy_dir = "../../../target"
   config.jar_name = "rails7_test-1.0"
+
+  config.webxml.rails.env = 'development'
 end

integration/rails7_test/src/main/ruby/db/development.sqlite3

@@ -1,4 +1,4 @@
-class CreatePosts < ActiveRecord::Migration
+class CreatePosts < ActiveRecord::Migration[7.1]
   def change
     create_table :posts do |t|
       t.string :name

integration/rails7_test/src/main/ruby/db/migrate/20130502003552_create_posts.rb

@@ -1,24 +1,22 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20130502003552) do
-
-  create_table "posts", force: true do |t|
-    t.string   "name"
-    t.string   "title"
-    t.text     "content"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+ActiveRecord::Schema[7.1].define(version: 2013_05_02_003552) do
+  create_table "posts", force: :cascade do |t|
+    t.string "name"
+    t.string "title"
+    t.text "content"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
 end

integration/rails7_test/src/main/ruby/db/schema.rb

@@ -2,36 +2,34 @@
 
 import java.net.*;
 import java.io.*;
-import org.junit.Assert;
+
 import org.junit.Test;
-import org.hamcrest.Matcher;
-import org.hamcrest.Matchers;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Unit test for simple App.
  */
-public class Rails7AppTestIT
-{
-    private static String appName = "rails7_test-1.0";
-
+public class Rails7AppTestIT {
     /**
      * Hit the web app and test the response
      */
     @Test
-    public void testApp() throws Exception
-    {
-        URL route = new URL("http://localhost:8080/" + appName + "/posts");
-        URLConnection routeConn = route.openConnection();
-        BufferedReader in = new BufferedReader( new InputStreamReader( routeConn.getInputStream()));
-
-        String inputLine;
-        String content = "";
-
-        while ((inputLine = in.readLine()) != null)
-            content += inputLine;
-        in.close();
+    public void testApp() throws Exception {
+        String content = contentFrom("http://localhost:8080/posts/");
+        assertThat(content, containsString("Rails7App"));
+        assertThat(content, containsString("Listing posts"));
+    }
 
-        Assert.assertThat(content, Matchers.containsString("Rails7App"));
-        Assert.assertThat(content, Matchers.containsString("Listing posts"));
+    private static String contentFrom(String url) throws IOException {
+        URL route = new URL(url);
+        StringBuilder content = new StringBuilder();
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(route.openStream()))) {
+            while (in.ready()) {
+                content.append(in.readLine());
+            }
+        }
+        return content.toString();
     }
 }