enju_news 0.2.0 → 0.3.0.beta.1

data/spec/controllers/news_posts_controller_spec.rb

@@ -4,12 +4,12 @@ describe NewsPostsController do
   fixtures :all
 
   def valid_attributes
-    FactoryGirl.attributes_for(:news_post)
+    FactoryBot.attributes_for(:news_post)
   end
 
   describe "GET index" do
     before(:each) do
-      FactoryGirl.create(:news_post)
+      FactoryBot.create(:news_post)
     end
 
     describe "When logged in as Administrator" do
@@ -49,14 +49,14 @@ describe NewsPostsController do
 
   describe "GET show" do
     before(:each) do
-      @news_post = FactoryGirl.create(:news_post)
+      @news_post = FactoryBot.create(:news_post)
     end
 
     describe "When logged in as Administrator" do
       login_admin
 
       it "assigns the requested news_post as @news_post" do
-        get :show, :id => @news_post.id
+        get :show, params: { id: @news_post.id }
         assigns(:news_post).should eq(@news_post)
       end
     end
@@ -65,7 +65,7 @@ describe NewsPostsController do
       login_librarian
 
       it "assigns the requested news_post as @news_post" do
-        get :show, :id => @news_post.id
+        get :show, params: { id: @news_post.id }
         assigns(:news_post).should eq(@news_post)
       end
     end
@@ -74,14 +74,14 @@ describe NewsPostsController do
       login_user
 
       it "assigns the requested news_post as @news_post" do
-        get :show, :id => @news_post.id
+        get :show, params: { id: @news_post.id }
         assigns(:news_post).should eq(@news_post)
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested news_post as @news_post" do
-        get :show, :id => @news_post.id
+        get :show, params: { id: @news_post.id }
         assigns(:news_post).should eq(@news_post)
       end
     end
@@ -129,14 +129,14 @@ describe NewsPostsController do
 
   describe "GET edit" do
     before(:each) do
-      @news_post = FactoryGirl.create(:news_post)
+      @news_post = FactoryBot.create(:news_post)
     end
 
     describe "When logged in as Administrator" do
       login_admin
 
       it "assigns the requested news_post as @news_post" do
-        get :edit, :id => @news_post.id
+        get :edit, params: { id: @news_post.id }
         assigns(:news_post).should eq(@news_post)
       end
     end
@@ -145,7 +145,7 @@ describe NewsPostsController do
       login_librarian
 
       it "assigns the requested news_post as @news_post" do
-        get :edit, :id => @news_post.id
+        get :edit, params: { id: @news_post.id }
         response.should be_forbidden
       end
     end
@@ -154,14 +154,14 @@ describe NewsPostsController do
       login_user
 
       it "assigns the requested news_post as @news_post" do
-        get :edit, :id => @news_post.id
+        get :edit, params: { id: @news_post.id }
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not assign the requested news_post as @news_post" do
-        get :edit, :id => @news_post.id
+        get :edit, params: { id: @news_post.id }
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -170,7 +170,7 @@ describe NewsPostsController do
   describe "POST create" do
     before(:each) do
       @attrs = valid_attributes
-      @invalid_attrs = {:body => ''}
+      @invalid_attrs = {body: ''}
     end
 
     describe "When logged in as Administrator" do
@@ -178,24 +178,24 @@ describe NewsPostsController do
 
       describe "with valid params" do
         it "assigns a newly created news_post as @news_post" do
-          post :create, :news_post => @attrs
+          post :create, params: { news_post: @attrs }
           assigns(:news_post).should be_valid
         end
 
         it "redirects to the created news_post" do
-          post :create, :news_post => @attrs
+          post :create, params: { news_post: @attrs }
           response.should redirect_to(assigns(:news_post))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_post as @news_post" do
-          post :create, :news_post => @invalid_attrs
+          post :create, params: { news_post: @invalid_attrs }
           assigns(:news_post).should_not be_valid
         end
 
         it "should be successful" do
-          post :create, :news_post => @invalid_attrs
+          post :create, params: { news_post: @invalid_attrs }
           response.should be_success
         end
       end
@@ -206,24 +206,24 @@ describe NewsPostsController do
 
       describe "with valid params" do
         it "assigns a newly created news_post as @news_post" do
-          post :create, :news_post => @attrs
+          post :create, params: { news_post: @attrs }
           assigns(:news_post).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :news_post => @attrs
+          post :create, params: { news_post: @attrs }
           response.should be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_post as @news_post" do
-          post :create, :news_post => @invalid_attrs
+          post :create, params: { news_post: @invalid_attrs }
           assigns(:news_post).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :news_post => @invalid_attrs
+          post :create, params: { news_post: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -234,24 +234,24 @@ describe NewsPostsController do
 
       describe "with valid params" do
         it "assigns a newly created news_post as @news_post" do
-          post :create, :news_post => @attrs
+          post :create, params: { news_post: @attrs }
           assigns(:news_post).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :news_post => @attrs
+          post :create, params: { news_post: @attrs }
           response.should be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_post as @news_post" do
-          post :create, :news_post => @invalid_attrs
+          post :create, params: { news_post: @invalid_attrs }
           assigns(:news_post).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :news_post => @invalid_attrs
+          post :create, params: { news_post: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -260,24 +260,24 @@ describe NewsPostsController do
     describe "When not logged in" do
       describe "with valid params" do
         it "assigns a newly created news_post as @news_post" do
-          post :create, :news_post => @attrs
+          post :create, params: { news_post: @attrs }
           assigns(:news_post).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :news_post => @attrs
+          post :create, params: { news_post: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_post as @news_post" do
-          post :create, :news_post => @invalid_attrs
+          post :create, params: { news_post: @invalid_attrs }
           assigns(:news_post).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :news_post => @invalid_attrs
+          post :create, params: { news_post: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -286,9 +286,9 @@ describe NewsPostsController do
 
   describe "PUT update" do
     before(:each) do
-      @news_post = FactoryGirl.create(:news_post)
+      @news_post = FactoryBot.create(:news_post)
       @attrs = valid_attributes
-      @invalid_attrs = {:body => ''}
+      @invalid_attrs = {body: ''}
     end
 
     describe "When logged in as Administrator" do
@@ -296,23 +296,23 @@ describe NewsPostsController do
 
       describe "with valid params" do
         it "updates the requested news_post" do
-          put :update, :id => @news_post.id, :news_post => @attrs
+          put :update, params: { id: @news_post.id, news_post: @attrs }
         end
 
         it "assigns the requested news_post as @news_post" do
-          put :update, :id => @news_post.id, :news_post => @attrs
+          put :update, params: { id: @news_post.id, news_post: @attrs }
           assigns(:news_post).should eq(@news_post)
         end
 
         it "moves its position when specified" do
-          put :update, :id => @news_post.id, :news_post => @attrs, :move => 'lower'
+          put :update, params: { id: @news_post.id, news_post: @attrs, move: 'lower' }
           response.should redirect_to(news_posts_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested news_post as @news_post" do
-          put :update, :id => @news_post.id, :news_post => @invalid_attrs
+          put :update, params: { id: @news_post.id, news_post: @invalid_attrs }
           response.should render_template("edit")
         end
       end
@@ -323,11 +323,11 @@ describe NewsPostsController do
 
       describe "with valid params" do
         it "updates the requested news_post" do
-          put :update, :id => @news_post.id, :news_post => @attrs
+          put :update, params: { id: @news_post.id, news_post: @attrs }
         end
 
         it "assigns the requested news_post as @news_post" do
-          put :update, :id => @news_post.id, :news_post => @attrs
+          put :update, params: { id: @news_post.id, news_post: @attrs }
           assigns(:news_post).should eq(@news_post)
           response.should be_forbidden
         end
@@ -335,7 +335,7 @@ describe NewsPostsController do
 
       describe "with invalid params" do
         it "assigns the requested news_post as @news_post" do
-          put :update, :id => @news_post.id, :news_post => @invalid_attrs
+          put :update, params: { id: @news_post.id, news_post: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -346,11 +346,11 @@ describe NewsPostsController do
 
       describe "with valid params" do
         it "updates the requested news_post" do
-          put :update, :id => @news_post.id, :news_post => @attrs
+          put :update, params: { id: @news_post.id, news_post: @attrs }
         end
 
         it "assigns the requested news_post as @news_post" do
-          put :update, :id => @news_post.id, :news_post => @attrs
+          put :update, params: { id: @news_post.id, news_post: @attrs }
           assigns(:news_post).should eq(@news_post)
           response.should be_forbidden
         end
@@ -358,7 +358,7 @@ describe NewsPostsController do
 
       describe "with invalid params" do
         it "assigns the requested news_post as @news_post" do
-          put :update, :id => @news_post.id, :news_post => @invalid_attrs
+          put :update, params: { id: @news_post.id, news_post: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -367,18 +367,18 @@ describe NewsPostsController do
     describe "When not logged in" do
       describe "with valid params" do
         it "updates the requested news_post" do
-          put :update, :id => @news_post.id, :news_post => @attrs
+          put :update, params: { id: @news_post.id, news_post: @attrs }
         end
 
         it "should be forbidden" do
-          put :update, :id => @news_post.id, :news_post => @attrs
+          put :update, params: { id: @news_post.id, news_post: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested news_post as @news_post" do
-          put :update, :id => @news_post.id, :news_post => @invalid_attrs
+          put :update, params: { id: @news_post.id, news_post: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -387,18 +387,18 @@ describe NewsPostsController do
 
   describe "DELETE destroy" do
     before(:each) do
-      @news_post = FactoryGirl.create(:news_post)
+      @news_post = FactoryBot.create(:news_post)
     end
 
     describe "When logged in as Administrator" do
       login_admin
 
       it "destroys the requested news_post" do
-        delete :destroy, :id => @news_post.id
+        delete :destroy, params: { id: @news_post.id }
       end
 
       it "redirects to the news_posts list" do
-        delete :destroy, :id => @news_post.id
+        delete :destroy, params: { id: @news_post.id }
         response.should redirect_to(news_posts_url)
       end
     end
@@ -407,11 +407,11 @@ describe NewsPostsController do
       login_librarian
 
       it "destroys the requested news_post" do
-        delete :destroy, :id => @news_post.id
+        delete :destroy, params: { id: @news_post.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @news_post.id
+        delete :destroy, params: { id: @news_post.id }
         response.should be_forbidden
       end
     end
@@ -420,22 +420,22 @@ describe NewsPostsController do
       login_user
 
       it "destroys the requested news_post" do
-        delete :destroy, :id => @news_post.id
+        delete :destroy, params: { id: @news_post.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @news_post.id
+        delete :destroy, params: { id: @news_post.id }
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "destroys the requested news_post" do
-        delete :destroy, :id => @news_post.id
+        delete :destroy, params: { id: @news_post.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @news_post.id
+        delete :destroy, params: { id: @news_post.id }
         response.should redirect_to(new_user_session_url)
       end
     end

data/spec/dummy/app/models/user.rb

@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
   devise :database_authenticatable, #:registerable,
-    :recoverable, :rememberable, :trackable, #, :validatable
-    :lockable, :lock_strategy => :none, :unlock_strategy => :none
+    :recoverable, :rememberable, :trackable, # , :validatable
+    :lockable, lock_strategy: :none, unlock_strategy: :none
 
   include EnjuSeed::EnjuUser
 end

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/dummy/bin/setup

@@ -1,29 +1,38 @@
 #!/usr/bin/env ruby
 require 'pathname'
+require 'fileutils'
+include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
-Dir.chdir APP_ROOT do
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
   # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system! 'bin/rails db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system! 'bin/rails restart'
 end