trusty-cms 3.9.5 → 3.9.6

data/db/migrate/20200117141251_create_admin_users.rb

@@ -42,5 +42,10 @@ class CreateAdminUsers < ActiveRecord::Migration[5.2]
 
       t.timestamps
     end
+
+    add_index :admins, :email,                unique: true
+    add_index :admins, :reset_password_token, unique: true
+    add_index :admins, :confirmation_token,   unique: true
+    add_index :admins, :unlock_token,         unique: true
   end
 end

data/lib/tasks/upgrade_to_devise.rake

@@ -22,4 +22,4 @@ namespace :import do
       )
     end
   end
-end
+end

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '3.9.5'
+    VERSION = '3.9.6'
   end
 end

data/spec/controllers/welcome_controller_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+RSpec.describe Admin::WelcomeController, :type => :controller do
+  routes { TrustyCms::Engine.routes }
+
+end

data/spec/dummy/config/application.rb

@@ -11,7 +11,7 @@ require 'string_extensions/string_extensions'
 require 'active_record_extensions/active_record_extensions'
 require 'configuration_extensions/configuration_extensions'
 require 'rack/cache'
-require "sassc-rails"
+require "sass-rails"
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line

data/spec/dummy/db/schema.rb

@@ -12,36 +12,6 @@
 
 ActiveRecord::Schema.define(version: 2016_10_27_141250) do
 
-  create_table "admins", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
-    t.string "email", default: "", null: false
-    t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
-    t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
-    t.string "current_sign_in_ip"
-    t.string "last_sign_in_ip"
-    t.string "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
-    t.string "unconfirmed_email"
-    t.integer "failed_attempts", default: 0, null: false
-    t.string "unlock_token"
-    t.datetime "locked_at"
-    t.string "first_name"
-    t.string "last_name"
-    t.boolean "admin"
-    t.boolean "designer"
-    t.boolean "content_editor"
-    t.integer "site_id"
-    t.integer "updated_by_id"
-    t.text "notes"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
   create_table "assets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "caption"
     t.string "title"

data/spec/features/admin_login_spec.rb

@@ -0,0 +1,92 @@
+require 'rails_helper'
+
+describe 'Administration Interface Login' do
+  fixtures :users
+
+  it 'shows a login page' do
+    visit '/'
+
+    expect(page).to have_field 'Username or E-mail Address'
+    expect(page).to have_field 'Password'
+    expect(page).to have_button 'Login'
+  end
+
+  it 'shows an error if the username is wrong' do
+    log_in_as 'nonexistent_username'
+
+    expect(find('#error')).to have_content "Invalid username, e-mail address, or password."
+  end
+
+  describe 'as an admin user' do
+    before(:each) do
+      @admin = users(:captain_janeway)
+    end
+
+    context 'after login' do
+      before(:each) do
+        log_in_as @admin.login
+      end
+
+      it 'shows the admin interface' do
+        expect(page).to have_content "Logged in as"
+      end
+
+      it 'has correct links in header' do
+        expect(page).to have_link @admin.name, href: '/admin/preferences/edit'
+        expect(page).to have_link 'Logout', href: '/admin/logout'
+        expect(page).to have_link 'View Site', href: '/'
+      end
+
+      it 'has correct links in navigation' do
+        within '#navigation' do
+          expect(page).to have_link "Content", href: '/admin/pages'
+          expect(page).to have_link "Design", href: '/admin/layouts'
+          expect(page).to have_link "Settings", href: '/admin/configuration'
+        end
+      end
+
+      it 'outputs table header as html' do
+        expect(page).to have_selector "table#pages th.name"
+      end
+
+
+      it 'can navigate to create new page' do
+        visit '/admin/pages/new'
+        expect(page).to have_selector "h1", text: "New Page"
+      end
+
+      it 'can log out' do
+        click_link "Logout"
+        expect(page).to have_content "You are now logged out."
+
+        visit '/admin/pages/new'
+        expect(page).to have_content "Please Login"
+      end
+    end
+
+    it 'shows an error if the password is wrong' do
+      log_in_as @admin.login, 'passwordwhoops'
+
+      expect(find('#error')).to have_content "Invalid username, e-mail address, or password."
+    end
+  end
+
+  describe 'as a regular user after login' do
+    before(:each) do
+      @user = users(:neelix)
+      log_in_as @user.login
+    end
+
+    it 'can log in to the admin interface' do
+      expect(page).to have_content "Logged in as"
+    end
+
+    it 'has correct links in navigation' do
+      within '#navigation' do
+        expect(page).to have_link "Content", href: '/admin/pages'
+        expect(page).not_to have_link "Design"
+        expect(page).to have_link "Settings", href: '/admin/configuration'
+      end
+    end
+  end
+end

data/spec/features/config_spec.rb

@@ -5,30 +5,30 @@ describe 'Configuration (Settings)' do
 
   before(:each) do
     @admin = users(:captain_janeway)
-    login_as(@admin, :scope => :user)
+    log_in_as @admin.login
     click_link 'Settings'
   end
 
-  # it 'has personal and site preferences' do
-  #   expect(page).to have_content 'Personal Preferences'
-  #   expect(page).to have_content 'Configuration'
-  # end
+  it 'has personal and site preferences' do
+    expect(page).to have_content 'Personal Preferences'
+    expect(page).to have_content 'Configuration'
+  end
 
-  # it 'lets you edit your personal preferences' do
-  #   click_button 'Edit Preferences'
-  #   fill_in 'Name', with: 'Captain Kathryn Janeway'
-  #   click_button 'Save Changes'
+  it 'lets you edit your personal preferences' do
+    click_button 'Edit Preferences'
+    fill_in 'Name', with: 'Captain Kathryn Janeway'
+    click_button 'Save Changes'
 
-  #   expect(page).to have_content 'Name Captain Kathryn Janeway'
-  # end
+    expect(page).to have_content 'Name Captain Kathryn Janeway'
+  end
 
-  # it 'lets you edit the site preferences' do
-  #   click_button 'Edit Configuration'
-  #   fill_in 'Site Title', with: 'My Special Site'
-  #   click_button 'Save Changes'
+  it 'lets you edit the site preferences' do
+    click_button 'Edit Configuration'
+    fill_in 'Site Title', with: 'My Special Site'
+    click_button 'Save Changes'
 
-  #   within '#site_title' do
-  #     expect(page).to have_content  'My Special Site'
-  #   end
-  # end
+    within '#site_title' do
+      expect(page).to have_content  'My Special Site'
+    end
+  end
 end

data/spec/features/layouts_spec.rb

@@ -5,22 +5,22 @@ describe 'Layouts (Design)' do
 
   before(:each) do
     @admin = users(:captain_janeway)
-    login_as(@admin, :scope => :user)
+    log_in_as @admin.login
     click_link 'Design'
   end
 
   context 'without any layouts' do
-    # it 'says it has no layouts' do
-    #   expect(page).to have_content 'No Layouts'
-    # end
+    it 'says it has no layouts' do
+      expect(page).to have_content 'No Layouts'
+    end
 
-    # it 'lets you add a layout' do
-    #   click_link 'New Layout'
-    #   fill_in 'Name', with: 'Petunias'
-    #   fill_in 'Body', with: 'Wisteria'
-    #   click_button 'Create Layout'
-    #   expect(page).to have_content 'Petunias'
-    # end
+    it 'lets you add a layout' do
+      click_link 'New Layout'
+      fill_in 'Name', with: 'Petunias'
+      fill_in 'Body', with: 'Wisteria'
+      click_button 'Create Layout'
+      expect(page).to have_content 'Petunias'
+    end
   end
 
   context 'with a layout' do
@@ -29,21 +29,21 @@ describe 'Layouts (Design)' do
       visit '/admin/layouts'
     end
 
-    # it 'lets you edit the layout' do
-    #   click_link 'Petunias'
-    #   expect(page).to have_content 'Edit Layout'
-    #   expect(page).to have_field 'Name', with: 'Petunias'
-    #   expect(page).to have_field 'Body', with: 'Wisteria'
-    #   expect(page).to have_button 'Save Changes'
-    #   expect(page).to have_content 'Last Updated by Kathryn Janeway'
-    # end
+    it 'lets you edit the layout' do
+      click_link 'Petunias'
+      expect(page).to have_content 'Edit Layout'
+      expect(page).to have_field 'Name', with: 'Petunias'
+      expect(page).to have_field 'Body', with: 'Wisteria'
+      expect(page).to have_button 'Save Changes'
+      expect(page).to have_content 'Last Updated by Kathryn Janeway'
+    end
 
-    # it 'lets you remove the layout' do
-    #   click_link 'Remove'
-    #   expect(page).to have_content 'Are you sure you want to permanently remove the following layout?'
-    #   click_button 'Delete Layout'
-    #   expect(page).to have_content 'No Layouts'
-    #   expect(page).to have_link 'New Layout'
-    # end
+    it 'lets you remove the layout' do
+      click_link 'Remove'
+      expect(page).to have_content 'Are you sure you want to permanently remove the following layout?'
+      click_button 'Delete Layout'
+      expect(page).to have_content 'No Layouts'
+      expect(page).to have_link 'New Layout'
+    end
   end
 end

data/spec/features/pages_spec.rb

@@ -5,25 +5,25 @@ describe 'Pages' do
 
   before(:each) do
     @admin = users(:captain_janeway)
-    login_as(@admin, :scope => :user)
+    log_in_as @admin.login
   end
 
   context 'without any pages' do
-    # it 'can create a new homepage' do
-    #   click_link 'New Homepage'
-    #   fill_in 'Page Title', with: 'Voyager Home'
-    #   fill_in 'Breadcrumb', with: 'Home'
-    #   click_button 'Create Page'
-
-    #   within 'table#pages' do
-    #     expect(page).to have_selector 'tbody tr', count: 1
-    #     expect(page).to have_link 'Voyager Home'
-    #     expect(page).to have_link 'Add Child'
-    #     expect(page).to have_link 'Normal Page'
-    #     expect(page).to have_link 'File Not Found'
-    #     expect(page).to have_link 'Remove'
-    #   end
-    # end
+    it 'can create a new homepage' do
+      click_link 'New Homepage'
+      fill_in 'Page Title', with: 'Voyager Home'
+      fill_in 'Breadcrumb', with: 'Home'
+      click_button 'Create Page'
+
+      within 'table#pages' do
+        expect(page).to have_selector 'tbody tr', count: 1
+        expect(page).to have_link 'Voyager Home'
+        expect(page).to have_link 'Add Child'
+        expect(page).to have_link 'Normal Page'
+        expect(page).to have_link 'File Not Found'
+        expect(page).to have_link 'Remove'
+      end
+    end
   end
 
   context 'with only a homepage' do
@@ -33,23 +33,23 @@ describe 'Pages' do
     end
 
 
-    # it 'lets you edit the homepage' do
-    #   click_link 'Voyager Home'
+    it 'lets you edit the homepage' do
+      click_link 'Voyager Home'
 
-    #   expect(page).to have_field 'Page Title', with: 'Voyager Home'
-    #   expect(page).to have_button 'Save Changes'
-    #   expect(page).to have_content 'Last Updated by Kathryn Janeway'
-    # end
+      expect(page).to have_field 'Page Title', with: 'Voyager Home'
+      expect(page).to have_button 'Save Changes'
+      expect(page).to have_content 'Last Updated by Kathryn Janeway'
+    end
 
-    # it 'lets you remove the homepage' do
-    #   click_link 'Remove'
+    it 'lets you remove the homepage' do
+      click_link 'Remove'
 
-    #   expect(page).to have_content 'Are you sure you want to permanently remove the following Page?'
+      expect(page).to have_content 'Are you sure you want to permanently remove the following Page?'
 
-    #   click_button 'Delete Page'
+      click_button 'Delete Page'
 
-    #   expect(page).to have_content 'No Pages'
-    #   expect(page).to have_link 'New Homepage'
-    # end
+      expect(page).to have_content 'No Pages'
+      expect(page).to have_link 'New Homepage'
+    end
   end
 end

data/spec/fixtures/users.yml

@@ -1,13 +1,16 @@
+# Digest::SHA1.hexdigest("--nacl--password--")
+# => "c4c53733c893f09e30d685322a00ed2394f8b65e"
+
 captain_janeway:
-  first_name: 'Kathryn'
-  last_name: 'Janeway'
-  encrypted_password: '3MHtmC5=!By!' 
+  name: 'Kathryn Janeway'
+  login: 'captain'
+  salt: 'nacl'
+  password: 'c4c53733c893f09e30d685322a00ed2394f8b65e' # => 'password'
   admin: true
-  designer: false
 
-captain_picard:
-  first_name: 'Jean-Luc'
-  last_name: 'Picard'
-  encrypted_password: 'pK_2h76VNhVr' 
+neelix:
+  name: 'Neelix'
+  login: 'neelix'
+  salt: 'nacl'
+  password: 'c4c53733c893f09e30d685322a00ed2394f8b65e' # => 'password'
   admin: false
-  designer: true

data/spec/models/layout_spec.rb

@@ -8,7 +8,7 @@ describe Layout do
     it 'is invalid when blank' do
       layout = FactoryBot.build(:layout, name: '')
       layout.valid?
-      expect(layout.errors[:name]).to include("This field is required.")
+      expect(layout.errors[:name]).to include("this must not be blank")
     end
 
     it 'should validate uniqueness of' do
@@ -23,7 +23,7 @@ describe Layout do
       expect(layout.errors[:name]).to be_blank
       layout = FactoryBot.build(:layout, name: 'x' * 101)
       expect{layout.save!}.to raise_error(ActiveRecord::RecordInvalid)
-      expect(layout.errors[:name]).to include("This must not be longer than 100 characters")
+      expect(layout.errors[:name]).to include("this must not be longer than 100 characters")
     end
   end
 end

data/spec/routing/welcome_routing_spec.rb

@@ -0,0 +1,18 @@
+require "rails_helper"
+
+RSpec.describe "routes for Welcome", :type => :routing do
+  it "routes /admin/welcome to the admin/welcome controller" do
+    expect(get("/admin/welcome")).
+      to route_to("admin/welcome#index")
+  end
+
+  it "routes /admin/login to the admin/welcome controller" do
+    expect(get("/admin/login")).
+      to route_to("admin/welcome#login")
+  end
+
+  it "routes /admin/logout to the admin/welcome controller" do
+    expect(get("/admin/logout")).
+      to route_to("admin/welcome#logout")
+  end
+end

data/spec/spec_helper.rb

@@ -4,7 +4,6 @@ require 'rspec/rails'
 require 'factory_bot_rails'
 require 'simplecov'
 SimpleCov.start
-include Warden::Test::Helpers
 
 Rails.backtrace_cleaner.remove_silencers!
 # Load support files
@@ -18,7 +17,6 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
   config.order = "random"
-  config.include Warden::Test::Helpers
 
   config.before(:each, type: :controller) { @routes = TrustyCms::Engine.routes }
   config.before(:each, type: :routing)    { @routes = TrustyCms::Engine.routes }