make_it_so 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9ac6f0d77fb6e01dd7624748326a46c41d6783e2
-  data.tar.gz: c09977db2febc42710977548d5e7bb938fe7be3c
+SHA256:
+  metadata.gz: 2eb6df0b9f858c51c806d331ae101abb19f4b4ce12403073c78499a751673722
+  data.tar.gz: 92d50506cb7e2dd187c1031b9851b1d32c2f79f72b61a77e0acbddf9c3bf30f5
 SHA512:
-  metadata.gz: 6fadff30e6ccc16cbfe781dd9973a0f02b889581a60f3dd8e5369c634122177bdb4bb0ab91c55d943372be1e5f7fd2e77ad11613b9ff8bce290e293aba492209
-  data.tar.gz: e97860de45eb65ece6811879340cd38b770cdc8843bb569cf82366ec624f444d375c3056d65a84e3c0fcf4ca6c5c8b8327c740f8c570c958ae0bf43a3b64643d
+  metadata.gz: 7b67a140d54c639e3c2243179c73024e44931cfe45aa5b5e60b5b6c5b51a732c142e2ad73c05490db7dd8a00ddfb05f145f36b3a5be8f5b92b53f1382580b79f
+  data.tar.gz: 7f3b6b7c5ee3792f331f90d6922c13867bb48b2a79259ba02b254d0fc594b89646f930a6b196cd3767b49aabe121829e5f3c1078847b7cfc5f9276f89862bdb0

data/Gemfile

@@ -1,10 +1,11 @@
 source 'https://rubygems.org'
 
-ruby '2.4.2'
+ruby '2.6.3'
 
 # Specify your gem's dependencies in make_it_so.gemspec
 gemspec
 
 group :development do
   gem 'pry'
+  gem 'solargraph'
 end

data/README.md

@@ -41,7 +41,7 @@ By default, the generator will create a Rails app with the following options act
 - Postgres
 - Foundation
 - React
-- Karma
+- Jest
 
 To take advantage of view-specific javascript, inject a script tag at the end of the body tag. Javascript should always be the last thing loaded on the page. In view logic you can do the following:
 
@@ -53,7 +53,7 @@ var widget = new Something.Widget('foo');
 <% end %>
 ```
 
-There is experimental support for a `--jest` flag that will use Jest for client side testing instead of karma/jasmine.
+Using the `--js-test-lib` flag, it is also possible to set up a Karma/Jasmine test framework instead of Jest (`--js-test-lib karma`) or to omit either framework (`--js-test-lib false`).
 
 ### Sinatra
 

data/lib/generators/rails_app_generator.rb

@@ -52,15 +52,11 @@ module MakeItSo
       default: true,
       desc: 'Generate React setup'
 
-    class_option :karma,
-      type: :boolean,
-      default: true,
-      desc: 'Generate karma testing setup'
-
-    class_option :jest,
-      type: :boolean,
-      default: false,
-      desc: 'Generate jest testing setup'
+    class_option :js_test_lib,
+      type: :string,
+      default: "jest",
+      desc: 
+        "Generate Jest testing framework (default), Karma/Jasmine ('karma'), or no framework ('false')"
 
     def initialize(*args)
       super
@@ -106,13 +102,13 @@ module MakeItSo
         build 'react'
       end
 
-      if options[:jest]
+      if options[:js_test_lib] == "jest"
         build 'jest'
-      elsif options[:karma]
+      elsif options[:js_test_lib] == "karma"
         build 'karma'
       end
 
-      if options[:react] || options[:jest] || options[:karma]
+      if options[:react] || options[:js_test_lib]
         build 'yarn_install'
       end
     end

data/lib/make_it_so/command_line_interface.rb

@@ -4,7 +4,7 @@ module MakeItSo
     desc "rails <app_name>",
       "generates a rails application based on your specifications"
     option :devise, type: :boolean
-    option :jest, type: :boolean
+    option :js_test_lib, default: "jest"
     def rails(app_name)
       MakeItSo::RailsAppGenerator.start(ARGV[1..-1])
     end

data/lib/make_it_so/rails/app_builder.rb

@@ -66,6 +66,8 @@ module MakeItSo
 
           json["scripts"] ||= {}
           json["scripts"]["start"] = "./bin/webpack-dev-server"
+
+          json["dependencies"].delete("babel-preset-react")
         end
 
         inside 'app/javascript/packs' do
@@ -76,7 +78,7 @@ module MakeItSo
 
       def karma
         after_bundle do
-          unparsed_json = snippet('js_testing_deps.json')
+          unparsed_json = snippet('js_karma_jasmine_testing_deps.json')
           parsed_json = JSON.parse(unparsed_json)
 
           modify_json(package_json_file) do |json|
@@ -95,6 +97,9 @@ module MakeItSo
           append_to_file '.gitignore' do
             "coverage/*\n"
           end
+
+          remove_file '.babelrc'
+          template '.babelrc'
         end
       end
 
@@ -131,18 +136,8 @@ module MakeItSo
             })
           end
 
-          run 'touch .babelrc'
-          modify_json(File.join(destination_root, '.babelrc')) do |json|
-            json["env"] ||= {}
-            json["env"]["test"] ||= {}
-            json["env"]["test"].merge!({
-              "env": {
-                "test": {
-                  "presets": ["react", "env"],
-                }
-              }
-            })
-          end
+          remove_file '.babelrc'
+          template '.babelrc'
         end
       end
 
@@ -251,7 +246,7 @@ module MakeItSo
           #note: temporary fix that can be removed once devise progresses #beyond v4.4.3
           # https://github.com/plataformatec/devise/pull/4869/files
           inside 'config/initializers' do
-            insert_into_file 'devise.rb', 
+            insert_into_file 'devise.rb',
               after: "Devise.setup do |config|" do
                 "  config.secret_key = Rails.application.secret_key_base\n"
             end
@@ -278,14 +273,12 @@ module MakeItSo
       end
 
       def foundation_dependency
-        @generator.gem 'foundation-rails', '~> 5.0'
+        @generator.gem 'foundation-rails', '~> 6.5'
 
         after_bundle do
           generate 'foundation:install foundation'
           # foundation-rails generates an application layout so we
           # must remove it
-          # there is a pull request open to skip this:
-          # https://github.com/zurb/foundation-rails/pull/108
           remove_file 'app/views/layouts/foundation.html.erb'
 
           inside 'app/assets/javascripts' do
@@ -297,10 +290,10 @@ module MakeItSo
       end
 
       protected
-      PACKAGE_PATH = 'package.json'
-      WEBCONFIG_PATH = 'webpack.config.js'
 
-      protected
+      PACKAGE_PATH = "package.json"
+      WEBCONFIG_PATH = "webpack.config.js"
+
       def parsed_package_json
         @package_json ||= parse_json_file(package_json_file)
       end

data/lib/make_it_so/version.rb

@@ -1,3 +1,3 @@
 module MakeItSo
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

data/make_it_so.gemspec

@@ -23,9 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activerecord", "~> 5.2"
   spec.add_dependency "json"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "appraisal"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "bundler", "~> 2.0.2"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "capybara"
 end

data/snippets/rails/js_jest_testing_deps.json

@@ -1,10 +1,9 @@
 {
   "devDependencies": {
     "babel-jest": "~23.4.0",
-    "enzyme": "~3.3.0",
-    "enzyme-adapter-react-15.4": "~1.0.6",
+    "enzyme": "~3.10.0",
+    "enzyme-adapter-react-16": "~1.14.0",
     "fetch-mock": "~5.13.1",
-    "jest": "~23.4.1",
-    "react-addons-test-utils": "~15.6.2"
+    "jest": "~23.4.1"
   }
 }

data/snippets/rails/{js_testing_deps.json → js_karma_jasmine_testing_deps.json}

@@ -1,11 +1,11 @@
 {
   "devDependencies": {
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "enzyme": "~2.9.1",
+    "enzyme": "~3.10.0",
+    "enzyme-adapter-react-16": "^1.14.0",
     "fetch-mock": "5",
     "fetch-ponyfill": "^6.0.2",
     "jasmine-core": "~2.4.1",
-    "jasmine-enzyme": "~3.4.0",
+    "jasmine-enzyme": "~7.0.0",
     "karma": "~0.13.22",
     "karma-coverage": "0.5.5",
     "karma-jasmine": "~0.3.8",
@@ -13,8 +13,6 @@
     "karma-sourcemap-loader": "0.3.7",
     "karma-spec-reporter": "0.0.26",
     "karma-webpack": "2.0.1",
-    "phantomjs-prebuilt": "~2.1.14",
-    "react-addons-test-utils": "~15.6.2"
+    "phantomjs-prebuilt": "~2.1.14"
   }
 }
-

data/snippets/rails/react_dependencies.json

@@ -1,12 +1,20 @@
 {
   "dependencies": {
-    "babel-preset-react": "~6.24.1",
     "prop-types": "~15.6.0",
-    "react": "~15.4.2",
-    "react-dom": "~15.4.2",
+    "react": "~16.8.0",
+    "react-dom": "~16.8.0",
+    "react-router-dom": "5.0.0",
     "redbox-react": "1.6.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.5.5",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+    "@babel/plugin-transform-runtime": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/preset-react": "^7.0.0",
+    "babel-loader": "^8.0.6",
     "webpack-cli": "^2.0.10",
     "webpack-dev-server": "^2.11.1"
   }

data/spec/features/{user_generates_rails_spec.rb → rails/user_generates_rails_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'user generates rails app' do
+feature 'user generates rails app with default settings' do
   def app_name
     'dummy_rails'
   end
@@ -9,7 +9,9 @@ feature 'user generates rails app' do
     join_paths(tmp_path, app_name)
   end
 
-  let(:css_manifest_path) { join_paths(app_path, 'app/assets/stylesheets/application.css') }
+  let(:css_manifest_path) {
+    join_paths(app_path, 'app/assets/stylesheets/application.css')
+  }
 
   let(:gemfile_path) { join_paths(app_path, 'Gemfile')}
   let(:package_json_path) { join_paths(app_path, 'package.json')}
@@ -84,7 +86,7 @@ feature 'user generates rails app' do
         expect(File.read(gemfile_path)).to include('capybara')
       end
 
-      it 'includes launch as a Gemfile dependency' do
+      it 'includes launchy as a Gemfile dependency' do
         expect(File.read(gemfile_path)).to include('launchy')
       end
 
@@ -188,8 +190,13 @@ feature 'user generates rails app' do
       expect(File.read(css_manifest_path)).to include('foundation_and_overrides')
     end
 
-    it 'includes modernizr in the layout' do
-      expect(File.read(File.join(app_path, 'app/views/layouts/application.html.erb'))).to include('modernizr')
+    it 'does not include foundation.html.erb' do
+      foundation_html = File.join(app_path, 'app/views/layouts/foundation.html.erb')
+      expect(FileTest.exists?(foundation_html)).to eq(false)
+    end
+
+    it 'does not include modernizr in the layout' do
+      expect(read_file('app/views/layouts/application.html.erb')).to_not include('modernizr')
     end
   end
 
@@ -200,7 +207,9 @@ feature 'user generates rails app' do
 
     it 'includes react in package.json' do
       in_package_json?(File.join(app_path, 'package.json')) do |json|
-        expect(json["dependencies"]["react"]).to_not be_nil
+        react = json["dependencies"]["react"]
+        expect(major_version(react)).to be 16
+        expect(minor_version(react)).to be 8
       end
     end
 
@@ -212,152 +221,166 @@ feature 'user generates rails app' do
 
     it 'includes react-dom in package.json' do
       in_package_json?(File.join(app_path, 'package.json')) do |json|
-        expect(json["dependencies"]["react-dom"]).to_not be_nil
+        react_dom = json["dependencies"]["react-dom"]
+        expect(major_version(react_dom)).to be 16
+        expect(minor_version(react_dom)).to be 8
+      end
+    end
+
+    it 'includes react-router-dom in package.json' do
+      in_package_json?(File.join(app_path, 'package.json')) do |json|
+        expect(json["dependencies"]["react-router-dom"]).to_not be_nil
       end
     end
   end
 
-  context 'karma' do
-    it 'creates a karma.config' do
-      karma_config = File.join(app_path, 'karma.conf.js')
-      expect(FileTest.exists?(karma_config)).to eq(true)
+  context 'dotenv' do
+    it 'adds dotenv-rails to Gemfile' do
+      expect(File.read(gemfile_path)).to match(/gem(.*)dotenv-rails/)
     end
 
-    it 'creates a testHelper.js' do
-      test_helper = File.join(app_path, 'spec/javascript/testHelper.js')
-      expect(FileTest.exists?(test_helper)).to eq(true)
+    it 'adds .env to gitignore' do
+      expect(read_file('.gitignore')).to include(".env\n")
     end
 
-    it 'includes karma in package.json' do
-      in_package_json?(File.join(app_path, 'package.json')) do |json|
-        expect(json["devDependencies"]["karma"]).to_not be_nil
-      end
+    it 'creates a .env file' do
+      expect(FileTest.exists?(File.join(app_path, '.env'))).to eq(true)
     end
 
-    it 'includes jasmine in package.json' do
+    it 'creates a .env.example file' do
+      expect(FileTest.exists?(File.join(app_path, '.env.example'))).to eq(true)
+    end
+  end
+
+  context 'babel' do
+    it 'includes necessary babel packages in package.json as dev dependencies' do
       in_package_json?(File.join(app_path, 'package.json')) do |json|
-        expect(json["devDependencies"]["jasmine-core"]).to_not be_nil
+        expect(json["devDependencies"]["@babel/core"]).to_not be_nil
+        expect(json["devDependencies"]["@babel/preset-env"]).to_not be_nil
+        expect(json["devDependencies"]["@babel/preset-react"]).to_not be_nil
+        expect(json["devDependencies"]["babel-loader"]).to_not be_nil
       end
     end
 
-    it 'includes react-addons-test-utils' do
+    it 'sets necessary presets in .babelrc' do
+      babelrc = read_file('.babelrc')
+      expect(babelrc).to include("@babel/env")
+      expect(babelrc).to include("@babel/react")
+    end
+  end
+
+  context 'enzyme' do
+    it 'includes enzyme in package.json' do
       in_package_json?(File.join(app_path, 'package.json')) do |json|
-        expect(json["devDependencies"]["react-addons-test-utils"]).to_not be_nil
+        enzyme = json["devDependencies"]["enzyme"]
+        expect(major_version(enzyme)).to be 3
+        expect(minor_version(enzyme)).to be 10
       end
     end
 
-    it 'includes fetch-mock' do
+    it 'includes enzyme-adapter-react-16 in package.json' do
       in_package_json?(File.join(app_path, 'package.json')) do |json|
-        expect(json["devDependencies"]["fetch-mock"]).to_not be_nil
+        adapter = json["devDependencies"]["enzyme-adapter-react-16"]
+        expect(major_version(adapter)).to be 1
+        expect(minor_version(adapter)).to be 14
       end
-
     end
 
-    it 'adds coverage/* to gitignore' do
-      expect(File.read(File.join(app_path, '.gitignore'))).to include("coverage/*\n")
+    it 'adds a spec/javascript/support/enzyme.js file' do
+      support_file = File.join(app_path, 'spec/javascript/support/enzyme.js')
+      expect(FileTest.exists?(support_file)).to eq(true)
     end
 
+    it 'adds spec/javascript/support/enzyme.js to setup' do
+      in_package_json?(package_json_path) do |json|
+        expect(json["jest"]).to_not be_nil
+        expect(json["jest"]["setupFiles"]).to include('./spec/javascript/support/enzyme.js')
+      end
+    end 
   end
 
-  context 'dotenv' do
-    it 'adds dotenv-rails to Gemfile' do
-      expect(File.read(gemfile_path)).to match(/gem(.*)dotenv-rails/)
+  context 'jest' do
+    it 'includes fetch-mock' do
+      in_package_json?(File.join(app_path, 'package.json')) do |json|
+        expect(json["devDependencies"]["fetch-mock"]).to_not be_nil
+      end
     end
 
-    it 'adds .env to gitignore' do
-      expect(File.read(File.join(app_path, '.gitignore'))).to include(".env\n")
+    scenario 'adds jest as a dependency' do
+      in_package_json?(package_json_path) do |json|
+        expect(json["devDependencies"]["jest"]).to_not be_nil
+      end
     end
 
-    it 'creates a .env file' do
-      expect(FileTest.exists?(File.join(app_path, '.env'))).to eq(true)
+    scenario 'adds enzyme as a dependency' do
+      in_package_json?(package_json_path) do |json|
+        expect(json["devDependencies"]["enzyme"]).to_not be_nil
+      end
     end
 
-    it 'creates a .env.example file' do
-      expect(FileTest.exists?(File.join(app_path, '.env.example'))).to eq(true)
+    scenario 'adds fetch-mock as a dependency' do
+      in_package_json?(package_json_path) do |json|
+        expect(json["devDependencies"]["fetch-mock"]).to_not be_nil
+      end
     end
-  end
-end
 
-feature 'jest' do
-  def app_name
-    'dummy_rails'
-  end
-
-  def app_path
-    join_paths(tmp_path, app_name)
-  end
-
-  before(:all) do
-    make_it_so!("rails #{app_name} --jest")
-  end
-
-  let(:package_json_path) { File.join(app_path, 'package.json') }
-
-
-  scenario 'adds jest as a dependency' do
-    in_package_json?(package_json_path) do |json|
-      expect(json["devDependencies"]["jest"]).to_not be_nil
+    scenario 'adds jest as the test script in package.json' do
+      in_package_json?(package_json_path) do |json|
+        expect(json["scripts"]["test"]).to include("jest")
+      end
     end
-  end
 
-  scenario 'adds enzyme as a dependency' do
-    in_package_json?(package_json_path) do |json|
-      expect(json["devDependencies"]["enzyme"]).to_not be_nil
+    scenario 'adds spec/javascripts to roots' do
+      in_package_json?(package_json_path) do |json|
+        expect(json["jest"]).to_not be_nil
+        expect(json["jest"]["roots"]).to include("spec/javascript")
+      end
     end
-  end
 
-  scenario 'adds fetch-mock as a dependency' do
-    in_package_json?(package_json_path) do |json|
-      expect(json["devDependencies"]["fetch-mock"]).to_not be_nil
+    scenario 'adds node_modules to modules directory' do
+      in_package_json?(package_json_path) do |json|
+        expect(json["jest"]).to_not be_nil
+        expect(json["jest"]["moduleDirectories"]).to_not be_nil
+        expect(json["jest"]["moduleDirectories"]).to include("node_modules")
+      end
     end
-  end
 
-  scenario 'adds jest as the test script in package.json' do
-    in_package_json?(package_json_path) do |json|
-      expect(json["scripts"]["test"]).to include("jest")
+    scenario 'adds app/javascript to modules directory' do
+      in_package_json?(package_json_path) do |json|
+        expect(json["jest"]).to_not be_nil
+        expect(json["jest"]["moduleDirectories"]).to_not be_nil
+        expect(json["jest"]["moduleDirectories"]).to include("app/javascript")
+      end
     end
-  end
 
-  scenario 'adds spec/javascripts to roots' do
-    in_package_json?(package_json_path) do |json|
-      expect(json["jest"]).to_not be_nil
-      expect(json["jest"]["roots"]).to include("spec/javascript")
+    scenario 'adds testURL to jest configuration' do
+      in_package_json?(package_json_path) do |json|
+        expect(json["jest"]).to_not be_nil
+        expect(json["jest"]["testURL"]).to_not be_nil
+        expect(json["jest"]["testURL"]).to eq("http://localhost/")
+      end
     end
   end
 
-  scenario 'adds node_modules to modules directory' do
-    in_package_json?(package_json_path) do |json|
-      expect(json["jest"]).to_not be_nil
-      expect(json["jest"]["moduleDirectories"]).to_not be_nil
-      expect(json["jest"]["moduleDirectories"]).to include("node_modules")
-    end
+  it 'does not create a karma.config' do
+    karma_config = File.join(app_path, 'karma.conf.js')
+    expect(FileTest.exists?(karma_config)).to eq(false)
   end
 
-  scenario 'adds app/javascript to modules directory' do
-    in_package_json?(package_json_path) do |json|
-      expect(json["jest"]).to_not be_nil
-      expect(json["jest"]["moduleDirectories"]).to_not be_nil
-      expect(json["jest"]["moduleDirectories"]).to include("app/javascript")
-    end
+  it 'does not create a testHelper.js' do
+    test_helper = File.join(app_path, 'spec/javascript/testHelper.js')
+    expect(FileTest.exists?(test_helper)).to eq(false)
   end
 
-  scenario 'adds testURL to jest configuration' do
-    in_package_json?(package_json_path) do |json|
-      expect(json["jest"]).to_not be_nil
-      expect(json["jest"]["testURL"]).to_not be_nil
-      expect(json["jest"]["testURL"]).to eq("http://localhost/")
+  it 'does not include karma in package.json' do
+    in_package_json?(File.join(app_path, 'package.json')) do |json|
+      expect(json["devDependencies"]["karma"]).to be_nil
     end
   end
 
-  scenario 'adds a spec/javascript/support/enzyme.js file' do
-    support_file = File.join(app_path, 'spec/javascript/support/enzyme.js')
-    expect(FileTest.exists?(support_file)).to eq(true)
-  end
-
-  scenario 'adds spec/javascript/support/enzyme.js to setup' do
-    in_package_json?(package_json_path) do |json|
-      expect(json["jest"]).to_not be_nil
-      expect(json["jest"]["setupFiles"]).to include('./spec/javascript/support/enzyme.js')
+  it 'does not include jasmine in package.json' do
+    in_package_json?(File.join(app_path, 'package.json')) do |json|
+      expect(json["devDependencies"]["jasmine-core"]).to be_nil
     end
   end
 end

data/spec/features/rails/user_generates_rails_with_karma_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+feature "user generates rails app with karma/jasmine" do
+  def app_name
+    'dummy_rails'
+  end
+
+  def app_path
+    join_paths(tmp_path, app_name)
+  end
+
+  before(:all) do
+    make_it_so!("rails #{app_name} --js-test-lib karma")
+  end
+
+  let(:package_json_path) { File.join(app_path, 'package.json') }
+
+  it 'creates a karma.config' do
+    karma_config = File.join(app_path, 'karma.conf.js')
+    expect(FileTest.exists?(karma_config)).to eq(true)
+  end
+
+  it 'creates a testHelper.js' do
+    test_helper = File.join(app_path, 'spec/javascript/testHelper.js')
+    expect(FileTest.exists?(test_helper)).to eq(true)
+  end
+
+  it 'includes karma in package.json' do
+    in_package_json?(File.join(app_path, 'package.json')) do |json|
+      expect(json["devDependencies"]["karma"]).to_not be_nil
+    end
+  end
+
+  it 'includes jasmine in package.json' do
+    in_package_json?(File.join(app_path, 'package.json')) do |json|
+      expect(json["devDependencies"]["jasmine-core"]).to_not be_nil
+    end
+  end
+
+  it 'adds coverage/* to gitignore' do
+    expect(read_file('.gitignore')).to include("coverage/*\n")
+  end
+
+  it 'configures enzyme with adapter in testHelper' do
+    testHelper = read_file('spec/javascript/testHelper.js')
+    expect(testHelper).to include("Enzyme.configure({ adapter: new EnzymeAdapter() })")
+  end
+
+  it 'karma.conf.js uses @babel/polyfill' do
+    expect(read_file('karma.conf.js')).to include("node_modules/@babel/polyfill/dist/polyfill.js")
+  end
+
+  it 'does not add jest as the test script in package.json' do
+    in_package_json?(package_json_path) do |json|
+      expect(json["scripts"]["test"]).to_not include("jest")
+    end
+  end
+end

data/spec/features/rails/user_generates_rails_without_js_test_lib_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+feature "user generates rails app without js test framework" do
+  def app_name
+    'dummy_rails'
+  end
+
+  def app_path
+    join_paths(tmp_path, app_name)
+  end
+
+  before(:all) do
+    make_it_so!("rails #{app_name} --js-test-lib false")
+  end
+
+  let(:package_json_path) { File.join(app_path, 'package.json') }
+
+  it 'does not create a karma.config' do
+    karma_config = File.join(app_path, 'karma.conf.js')
+    expect(FileTest.exists?(karma_config)).to eq(false)
+  end
+
+  it 'does not create a testHelper.js' do
+    test_helper = File.join(app_path, 'spec/javascript/testHelper.js')
+    expect(FileTest.exists?(test_helper)).to eq(false)
+  end
+
+  it 'does not create an enzyme config file' do
+    test_helper = File.join(app_path, 'spec/javascript/support/enzyme.js')
+    expect(FileTest.exists?(test_helper)).to eq(false)
+  end
+
+  it 'does not include karma or jest in package.json' do
+    in_package_json?(File.join(app_path, 'package.json')) do |json|
+      expect(json["devDependencies"]["karma"]).to be_nil
+      expect(json["devDependencies"]["jest"]).to be_nil
+    end
+  end
+
+  it 'does not include jasmine in package.json' do
+    in_package_json?(File.join(app_path, 'package.json')) do |json|
+      expect(json["devDependencies"]["jasmine-core"]).to be_nil
+    end
+  end
+
+  it 'does not add a test script in package.json' do
+    in_package_json?(package_json_path) do |json|
+      expect(json["scripts"]["test"]).to be_nil
+    end
+  end
+end

data/spec/support/make_it_so_spec_helpers.rb

@@ -50,6 +50,29 @@ module MakeItSoSpecHelpers
     json = JSON.parse(contents)
     yield(json)
   end
+
+  def read_file(file_path)
+    File.read(File.join(app_path, file_path))
+  end
+
+  def major_version(version_string)
+    version_array(version_string)[0]
+  end
+
+  def minor_version(version_string)
+    version_array(version_string)[1]
+  end
+
+  def patch_version(version_string)
+    version_array(version_string)[2]
+  end
+
+  def version_array(version_string)
+    version_string.delete!("^")
+    version_string.delete!("~")
+    version_array = version_string.split(".")
+    version_array.map{ |string| string.to_i }
+  end
 end
 
 RSpec.configure do |config|

data/templates/rails/.babelrc

@@ -0,0 +1,33 @@
+{
+  "presets": [
+    [
+      "@babel/env",
+      {
+        "modules": false,
+        "targets": {
+          "browsers": "> 1%"
+        },
+        "forceAllTransforms": true
+      }
+    ],
+    "@babel/react"
+  ],
+  "plugins": [
+    "@babel/syntax-dynamic-import",
+    "@babel/proposal-object-rest-spread",
+    [
+      "@babel/proposal-class-properties",
+      {
+        "spec": true
+      }
+    ]
+  ],
+  "env": {
+    "test": {
+      "presets": [
+        "@babel/env",
+        "@babel/react"
+      ]
+    }
+  }
+}

data/templates/rails/app/javascript/react/components/App.js

@@ -4,4 +4,4 @@ export const App = (props) => {
   return (<h1>Make It So React</h1>)
 }
 
-export default App
+export default App

data/templates/rails/app/views/layouts/application.html.erb.tt

@@ -4,20 +4,13 @@
   <title><%= camelized %></title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <%%= stylesheet_link_tag 'application', media: 'all' %>
-  <% if options.foundation? %>
-    <%%= javascript_include_tag "vendor/modernizr" %>
-  <% end %>
   <%%= csrf_meta_tags %>
 </head>
 <body>
   <%- if options.devise? -%>
   <% if options.foundation? %>
   <nav class="top-bar">
-    <ul class="title-area">
-      <li class="name">
-        <h1><a href="/"><%= camelized %></a></h1>
-      </li>
-    </ul>
+    <h1><a href="/"><%= camelized %></a></h1>
 
     <section class="top-bar-section">
       <ul class="right">

data/templates/rails/karma.conf.js

@@ -12,7 +12,7 @@ module.exports = function(config) {
     // files that Karma will server to the browser
     files: [
       // use Babel polyfill to emulate a full ES6 environment in PhantomJS
-      'node_modules/babel-polyfill/dist/polyfill.js',
+      'node_modules/@babel/polyfill/dist/polyfill.js',
       // entry file for Webpack
       'spec/javascript/testHelper.js'
     ],

data/templates/rails/spec/javascript/support/enzyme.js

@@ -1,6 +1,4 @@
 const Enzyme = require('enzyme');
-
 const EnzymeAdapter = require('enzyme-adapter-react-15.4');
 
 Enzyme.configure({ adapter: new EnzymeAdapter() });
-

data/templates/rails/spec/javascript/testHelper.js

@@ -1,3 +1,7 @@
+const Enzyme = require('enzyme');
+const EnzymeAdapter = require('enzyme-adapter-react-16');
+Enzyme.configure({ adapter: new EnzymeAdapter() });
+
 import { shallow, mount } from 'enzyme';
 import jasmineEnzyme from 'jasmine-enzyme';
 import React from 'react';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: make_it_so
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Dan Pickett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -72,42 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -146,18 +118,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/make_it_so
-- gemfiles/rails_4_0.gemfile
-- gemfiles/rails_4_0.gemfile.lock
-- gemfiles/rails_4_1.gemfile
-- gemfiles/rails_4_1.gemfile.lock
-- gemfiles/rails_4_2.gemfile
-- gemfiles/rails_4_2.gemfile.lock
 - lib/generators/gosu_app_generator.rb
 - lib/generators/rails_app_generator.rb
 - lib/generators/sinatra_app_generator.rb
@@ -169,11 +134,13 @@ files:
 - make_it_so.gemspec
 - snippets/rails/application_generator.rb
 - snippets/rails/js_jest_testing_deps.json
-- snippets/rails/js_testing_deps.json
+- snippets/rails/js_karma_jasmine_testing_deps.json
 - snippets/rails/react_dependencies.json
 - snippets/rails/user_factory.rb
+- spec/features/rails/user_generates_rails_spec.rb
+- spec/features/rails/user_generates_rails_with_karma_spec.rb
+- spec/features/rails/user_generates_rails_without_js_test_lib_spec.rb
 - spec/features/user_generates_gosu_spec.rb
-- spec/features/user_generates_rails_spec.rb
 - spec/features/user_generates_sinatra_spec.rb
 - spec/spec_helper.rb
 - spec/support/make_it_so_spec_helpers.rb
@@ -185,6 +152,7 @@ files:
 - templates/gosu/lib/bounding_box.rb
 - templates/gosu/lib/keys.rb
 - templates/gosu/spec/spec_helper.rb
+- templates/rails/.babelrc
 - templates/rails/.env
 - templates/rails/.env.example
 - templates/rails/.gitkeep
@@ -236,14 +204,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: An application generator for all things ruby
 test_files:
+- spec/features/rails/user_generates_rails_spec.rb
+- spec/features/rails/user_generates_rails_with_karma_spec.rb
+- spec/features/rails/user_generates_rails_without_js_test_lib_spec.rb
 - spec/features/user_generates_gosu_spec.rb
-- spec/features/user_generates_rails_spec.rb
 - spec/features/user_generates_sinatra_spec.rb
 - spec/spec_helper.rb
 - spec/support/make_it_so_spec_helpers.rb

data/Appraisals

@@ -1,4 +0,0 @@
-appraise "rails-4-2" do
-  gem "railties", "~> 4.2.0"
-end
-

data/gemfiles/rails_4_0.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "railties", "~> 4.0.12"
-
-group :development do
-  gem "pry"
-end
-
-gemspec :path => "../"

data/gemfiles/rails_4_0.gemfile.lock

@@ -1,88 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    make_it_so (0.0.2)
-      railties
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (4.0.12)
-      activesupport (= 4.0.12)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activesupport (4.0.12)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    appraisal (1.0.2)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    builder (3.1.4)
-    capybara (2.4.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    i18n (0.7.0)
-    method_source (0.8.2)
-    mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (4.7.5)
-    multi_json (1.10.1)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    railties (4.0.12)
-      actionpack (= 4.0.12)
-      activesupport (= 4.0.12)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    slop (3.6.0)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tzinfo (0.3.42)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bundler (~> 1.7)
-  capybara
-  make_it_so!
-  pry
-  railties (~> 4.0.12)
-  rake (~> 10.0)
-  rspec

data/gemfiles/rails_4_1.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "railties", "~> 4.1.8"
-
-group :development do
-  gem "pry"
-end
-
-gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile.lock

@@ -1,92 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    make_it_so (0.0.2)
-      railties
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (4.1.8)
-      actionview (= 4.1.8)
-      activesupport (= 4.1.8)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.8)
-      activesupport (= 4.1.8)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    appraisal (1.0.2)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    builder (3.2.2)
-    capybara (2.4.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    i18n (0.7.0)
-    json (1.8.1)
-    method_source (0.8.2)
-    mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.5.0)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    railties (4.1.8)
-      actionpack (= 4.1.8)
-      activesupport (= 4.1.8)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    slop (3.6.0)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bundler (~> 1.7)
-  capybara
-  make_it_so!
-  pry
-  railties (~> 4.1.8)
-  rake (~> 10.0)
-  rspec

data/gemfiles/rails_4_2.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "railties", "~> 4.2.0"
-
-group :development do
-  gem "pry"
-end
-
-gemspec :path => "../"

data/gemfiles/rails_4_2.gemfile.lock

@@ -1,106 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    make_it_so (0.0.2)
-      railties
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (4.2.0)
-      actionview (= 4.2.0)
-      activesupport (= 4.2.0)
-      rack (~> 1.6.0)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0)
-      activesupport (= 4.2.0)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activesupport (4.2.0)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    appraisal (1.0.2)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    builder (3.2.2)
-    capybara (2.4.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    i18n (0.7.0)
-    json (1.8.1)
-    loofah (2.0.1)
-      nokogiri (>= 1.5.9)
-    method_source (0.8.2)
-    mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.5.0)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.0)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
-      loofah (~> 2.0)
-    railties (4.2.0)
-      actionpack (= 4.2.0)
-      activesupport (= 4.2.0)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    slop (3.6.0)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bundler (~> 1.7)
-  capybara
-  make_it_so!
-  pry
-  railties (~> 4.2.0)
-  rake (~> 10.0)
-  rspec