archangel 0.3.0 → 0.4.0

data/lib/archangel/testing_support/factories/archangel_pages.rb

@@ -3,7 +3,7 @@
 FactoryBot.define do
   factory :page, class: "Archangel::Page" do
     site
-    template { nil }
+    design { nil }
     sequence(:title) { |n| "Page #{n} Title" }
     sequence(:slug) { |n| "page-#{n}" }
     content { "<p>Content of the page</p>" }
@@ -14,8 +14,8 @@ FactoryBot.define do
       association :parent, factory: :page
     end
 
-    trait :with_template do
-      association :template, factory: :template, partial: false
+    trait :with_design do
+      association :design, factory: :design, partial: false
     end
 
     trait :homepage do

data/lib/archangel/testing_support/factories/archangel_users.rb

@@ -11,6 +11,12 @@ FactoryBot.define do
     confirmed_at { Time.current }
     confirmation_sent_at { Time.current }
 
+    trait :invited do
+      sequence(:invitation_token) { |n| "invitation_token-#{n}" }
+      invitation_created_at { Time.current }
+      invitation_accepted_at { Time.current }
+    end
+
     trait :avatar do
       avatar { fixture_file_upload(uploader_test_image) }
     end

data/lib/archangel/testing_support/factories/archangel_widgets.rb

@@ -3,13 +3,13 @@
 FactoryBot.define do
   factory :widget, class: "Archangel::Widget" do
     site
-    template { nil }
+    design { nil }
     sequence(:name) { |n| "Widget #{n}" }
     sequence(:slug) { |n| "widget-#{n}" }
     content { "<p>Content of the widget</p>" }
 
-    trait :with_template do
-      association :template, factory: :template, partial: true
+    trait :with_design do
+      association :design, factory: :design, partial: true
     end
 
     trait :deleted do

data/lib/archangel/testing_support/helpers/authorization_helpers.rb

@@ -7,30 +7,7 @@ module Archangel
     #
     module AuthorizationHelpers
       ##
-      # Authorization helpers for controller testing
-      #
-      module Controller
-        def stub_authorization!(user = double("user"))
-          user.blank? ? stub_blank_authorization : stub_user_authorization(user)
-        end
-
-        private
-
-        def stub_blank_authorization
-          allow(request.env["warden"]).to(receive(:authenticate!))
-                                      .and_throw(:warden, scope: :user)
-          allow(controller).to receive(:current_user).and_return(nil)
-        end
-
-        def stub_user_authorization(user)
-          allow(request.env["warden"]).to(receive(:authenticate!))
-                                      .and_return(user)
-          allow(controller).to receive(:current_user).and_return(user)
-        end
-      end
-
-      ##
-      # Authorization helpers for feature testing
+      # Authorization helpers for feature and request testing
       #
       module Feature
         include Warden::Test::Helpers
@@ -50,9 +27,8 @@ module Archangel
 end
 
 RSpec.configure do |config|
-  config.include Archangel::TestingSupport::AuthorizationHelpers::Controller,
-                 type: :controller
-
-  config.include Archangel::TestingSupport::AuthorizationHelpers::Feature,
-                 type: :feature
+  %i[feature request].each do |type|
+    config.include Archangel::TestingSupport::AuthorizationHelpers::Feature,
+                   type: type
+  end
 end

data/lib/archangel/testing_support/helpers/fill_in_auth_form_helpers.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Archangel
+  module TestingSupport
+    ##
+    # Fill in login form helpers for testing
+    #
+    # Does not submit the form
+    #
+    module FillInAuthFormHelpers
+      def fill_in_login_form_with(email = "", password = "")
+        fill_in "Email", with: email
+        fill_in "Password", with: password
+      end
+
+      def fill_in_registration_form_with(name = "", username = "", email = "",
+                                         password = "")
+        fill_in "Name", with: name
+        fill_in "Username", with: username
+        fill_in "Email", with: email
+        fill_in_password_with(password, password)
+      end
+
+      def fill_in_invitation_form_with(password = "", confirm_password = "")
+        fill_in_password_with(password, confirm_password)
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include Archangel::TestingSupport::FillInAuthFormHelpers,
+                 type: :feature
+end

data/lib/archangel/testing_support/helpers/fill_in_form_helpers.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Archangel
+  module TestingSupport
+    ##
+    # Fill in form helpers for testing
+    #
+    # Does not submit the form
+    #
+    module FillInFormHelpers
+      def fill_in_password_with(password = "", confirm_password = "")
+        fill_in "Password", with: password, match: :prefer_exact
+        fill_in "Confirm Password", with: confirm_password, match: :prefer_exact
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include Archangel::TestingSupport::FillInFormHelpers, type: :feature
+end

data/lib/archangel/testing_support/support/capybara.rb

@@ -3,7 +3,4 @@
 require "capybara/rails"
 require "capybara/rspec"
 
-require "capybara/poltergeist"
-
-Capybara.javascript_driver = :poltergeist
 Capybara.default_max_wait_time = 10

data/lib/archangel/testing_support/support/shoulda.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "shoulda-matchers"
-require "shoulda-callback-matchers"
 
 Shoulda::Matchers.configure do |config|
   config.integrate do |with|

data/lib/archangel/version.rb

@@ -1,15 +1,19 @@
 # frozen_string_literal: true
 
+##
+# @see Archangel
+#
 module Archangel
   ##
   # Archangel gem version
   #
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0"
 
   ##
   # Archangel version
   #
   # @return [String] current version
+  #
   def self.version
     VERSION
   end

data/lib/generators/archangel/install/install_generator.rb

@@ -47,13 +47,9 @@ module Archangel
         say_quietly "Copying files..."
 
         %w[
-          .env.sample
-          config/initializers/carrierwave.rb
-          config/initializers/devise.rb
-          config/archangel.yml
-        ].each do |file|
-          template file
-        end
+          .env.sample config/initializers/carrierwave.rb
+          config/initializers/devise.rb config/archangel.yml
+        ].each { |file| template file }
       end
 
       ##
@@ -68,18 +64,6 @@ module Archangel
         end
       end
 
-      ##
-      # Disallow backend indexing in robots.txt
-      #
-      def disallow_robots
-        return unless File.exist? "public/robots.txt"
-
-        append_file "public/robots.txt", <<-ROBOTS.strip_heredoc
-          User-agent: *
-          Disallow: /backend
-        ROBOTS
-      end
-
       ##
       # Create seed file if needed
       #
@@ -111,18 +95,14 @@ module Archangel
       # Install Archangel migrations
       #
       def install_migrations
-        say_quietly "Installing migrations..."
-
-        silence_warnings { rake "railties:install:migrations" }
+        say_with_task("Installing migrations...", "railties:install:migrations")
       end
 
       ##
       # Create database is needed
       #
       def create_database
-        say_quietly "Creating database..."
-
-        silence_warnings { rake "db:create" }
+        say_with_task("Creating database...", "db:create")
       end
 
       ##
@@ -130,9 +110,7 @@ module Archangel
       #
       def run_migrations
         if options[:migrate]
-          say_quietly "Running migrations..."
-
-          silence_warnings { rake "db:migrate" }
+          say_with_task("Running migrations...", "db:migrate")
         else
           say_quietly "Skipping migrations. Run `rake db:migrate` yourself."
         end
@@ -143,9 +121,7 @@ module Archangel
       #
       def seed_database
         if options[:migrate] && options[:seed]
-          say_quietly "Inseminating..."
-
-          silence_warnings { rake "db:seed #{rake_seed_options}" }
+          say_with_task("Inseminating...", "db:seed #{rake_seed_options}")
         else
           say_quietly "Skipping seed data. Run `rake db:seed` yourself."
         end
@@ -189,12 +165,18 @@ module Archangel
           fields.map do |field|
             field_option = options[field.to_sym]
 
-            "#{field.upcase}=#{field_option}" unless field_option.blank?
+            "#{field.upcase}=#{field_option}" if field_option.present?
           end.compact.join(" ")
         end
 
+        def say_with_task(message, task)
+          say_quietly message
+
+          silence_warnings { rake task }
+        end
+
         def say_quietly(message)
-          puts message unless options[:quiet]
+          say(message) unless options[:quiet]
         end
       end
     end

data/lib/generators/archangel/install/templates/config/archangel.yml

@@ -4,11 +4,6 @@ default: &default
   #
   auth_path: "account"
 
-  # Allow user registrations.
-  # Default is `false`
-  #
-  allow_registration: false
-
   # Backend root path.
   # Default is "backend"
   #

data/lib/templates/erb/scaffold/_form.html.erb

@@ -1,5 +1,5 @@
 <%%= simple_form_for(@<%= singular_table_name %>, html: { class: "form-horizontal", autocomplete: "false" }) do |f| %>
-  <%%= f.error_notification %>
+  <%%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
 
   <div class="form-inputs">
   <%- attributes.each do |attribute| -%>
@@ -8,6 +8,6 @@
   </div>
 
   <div class="form-actions">
-    <%%= f.button :submit %>
+    <%%= f.button :submit, class: "btn btn-primary" %>
   </div>
 <%% end %>

data/package.json

@@ -5,17 +5,13 @@
   "author": "dfreerksen <dfreerksen@gmail.com>",
   "homepage": "https://github.com/archangel/archangel/",
   "description": "Archangel is a Rails CMS.",
+  "license": "MIT",
   "keywords": [
     "archangel",
     "cms",
     "rails",
     "ruby"
   ],
-  "license": "MIT",
-  "engines": {
-    "node": "8.11.1",
-    "yarn": "1.6.0"
-  },
   "repository": {
     "type": "git",
     "url": "archangel/archangel"
@@ -23,16 +19,13 @@
   "bugs": {
     "url": "https://github.com/archangel/archangel/issues"
   },
-  "files": [
-    "lib/assets/compiled/*.js"
-  ],
-  "main": "index.js",
-  "scripts": {
-    "test": "test"
+  "engines": {
+    "node": ">= 10.16.0",
+    "yarn": ">= 1.6.0"
   },
   "dependencies": {},
   "devDependencies": {
     "eslint": "^4.18.2",
-    "jshint": "^2.9.5"
+    "sass-lint": "^1.12.1"
   }
 }

data/spec/features/auth/invitation_spec.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe "Auth invitation", type: :feature do
+  let(:site) { create(:site) }
+
+  describe "with invalid invitation token" do
+    it "throws an error message with invalid invitation_token query param" do
+      visit "/account/invitation/accept?invitation_token=invalid-invite-token"
+
+      expect(page)
+        .to have_content("The invitation token provided is not valid!")
+    end
+
+    it "throws an error message without invitation_token query param" do
+      visit "/account/invitation/accept"
+
+      expect(page)
+        .to have_content("The invitation token provided is not valid!")
+    end
+
+    it "redirects to the login page" do
+      visit "/account/invitation/accept"
+
+      expect(page).to have_current_path("/account/login")
+    end
+  end
+
+  describe "with valid invitation token" do
+    let(:invitee) do
+      Archangel::User.invite!(site: site,
+                              name: "Amazing",
+                              username: "amazing",
+                              email: "amazing@email.com",
+                              role: "editor")
+    end
+
+    let(:raw_token) { invitee.raw_invitation_token }
+
+    before do
+      invitee
+
+      create(:page, :homepage, content: "Welcome to the homepage")
+    end
+
+    it "does not allow editing Role" do
+      visit "/account/invitation/accept?invitation_token=#{raw_token}"
+
+      expect(page).not_to have_text "Role"
+    end
+
+    it "has additional Name form field label" do
+      visit "/account/invitation/accept?invitation_token=#{raw_token}"
+
+      expect(page).to have_text "Name"
+    end
+
+    it "has additional Username form field label" do
+      visit "/account/invitation/accept?invitation_token=#{raw_token}"
+
+      expect(page).to have_text "Username"
+    end
+
+    it "has additional `name` form field" do
+      visit "/account/invitation/accept?invitation_token=#{raw_token}"
+
+      expect(page).to have_selector("input[type=text][id='user_name']")
+    end
+
+    it "has additional `username` form field" do
+      visit "/account/invitation/accept?invitation_token=#{raw_token}"
+
+      expect(page).to have_selector("input[type=text][id='user_username']")
+    end
+
+    it "allows successful invitation acceptance and redirects to homepage" do
+      visit "/account/invitation/accept?invitation_token=#{raw_token}"
+
+      fill_in_invitation_form_with("password", "password")
+      click_button "Set my password"
+
+      expect(page).to have_content("Welcome to the homepage")
+    end
+  end
+end