push_type_auth 0.9.5 → 0.10.0.beta.3

data/test/controllers/concerns/push_type/api_authentication_methods_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+module PushType
+  class ApiAuthenticationMethodsTest < ActiveSupport::TestCase
+
+    subject { PushType::ApiController.new }
+    let :before_filters do
+      subject._process_action_callbacks.find_all { |x| x.kind == :before }.map(&:filter)
+    end
+
+    it { subject.methods.include?(:authenticate_user!).must_equal true }
+    it { subject.methods.include?(:current_push_type_user).must_equal true }
+    it { subject.methods.include?(:auth_token).must_equal true }
+    it { before_filters.include?(:authenticate_user!).must_equal true }
+
+  end
+end

data/test/controllers/concerns/push_type/invitation_methods_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module PushType
   class InvitationMethodsTest < ActiveSupport::TestCase
 
-    subject { PushType::UsersController.new }
+    subject { PushType::Admin::UsersController.new }
 
     it { subject.methods.include?(:invite).must_equal true }
 

data/test/controllers/push_type/admin/profiles_controller_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+module PushType
+  class Admin::ProfilesControllerTest < ActionController::TestCase
+    
+    let(:current_user) { FactoryGirl.create(:confirmed_user) }
+    before { sign_in current_user }
+
+    describe 'GET #edit' do
+      before { get :edit }
+      it { response.must_render_template 'edit' }
+      it { assigns[:user].must_equal current_user }
+    end
+
+    describe 'PUT #update' do
+      before { put :update, params: { user: { name: new_name } } }
+
+      describe 'with invalid user' do
+        let(:new_name) { '' }
+        it { assigns[:user].errors.wont_be_empty }
+        it { response.must_render_template :edit }
+      end
+
+      describe 'with valid user' do
+        let(:new_name) { 'Test user ABC' }
+        it { current_user.reload.name.must_equal new_name }
+        it { flash[:notice].must_be :present? }
+        it { response.must_respond_with :redirect }
+      end
+    end
+
+  end
+end

data/test/controllers/push_type/admin/users_controller_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+module PushType
+  class Admin::UsersControllerTest < ActionController::TestCase
+
+    let(:current_user) { FactoryGirl.create(:confirmed_user) }
+    let(:user) { FactoryGirl.create :user }
+    before { sign_in current_user }
+
+    let(:last_email) { ActionMailer::Base.deliveries.last }
+    
+    describe 'PUT #invite' do
+      let(:referer) { '/push_type/users' }
+      before do
+        @request.env["HTTP_REFERER"] = referer
+        put :invite, params: { id: user.id }
+      end
+      it { response.must_redirect_to referer }
+      it { last_email.to.must_include user.email }
+      it { last_email.subject.must_include 'Confirm your account' }
+    end
+
+  end
+end

data/test/controllers/push_type/confirmations_controller_test.rb

@@ -32,7 +32,7 @@ module PushType
       describe 'with valid user' do
         let(:password) { 'pa$$word' }
         it { user.reload.must_be :confirmed? }
-        it { response.must_redirect_to root_path }
+        it { response.must_respond_with :redirect }
       end
     end
 

data/test/dummy/config/initializers/push_type.rb

@@ -45,6 +45,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = 'f4a06520fa34b14c4732b1c1f20dedbf0bfaa6596dbbdb65ef471cd3212f9840'
+  # config.dragonfly_secret = 'af00b3daa1641624497a9f2a0ff92483d2b865e66a94e36ffa39063f1ce452f2'
 
 end

data/test/dummy/config/routes.rb

@@ -1,6 +1,15 @@
 Rails.application.routes.draw do
 
+  # Mount all the registered PushType Rails Engines. This should be placed
+  # at the end of your routes.rb file to ensure your application routes are
+  # not overidden by PushType.
+  #
+  # Overide the default mount points by passing a hash of options.
+  # Example:
+  #
+  #   mount_push_type admin: 'cms', front_end: 'blog'
+  #
   mount_push_type
-
+  
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 0a8b17af2b75a2d43edd244334b4a2a81f881c9a2fc9e146debe02ef580dedca021d80e805c6f137bf0ca625b09ac1247b6c251cd7e7ffb8bc74e873e75b019d
+  secret_key_base: 223131a28f12d469debaa9c5f6c5fb5528babfbd47e0db7381cacf80406c8b159ad8d10f64aebaee26330a3dc04727f1ef4bd06ba71e38879e5dbb9b55999eb2
 
 test:
-  secret_key_base: 2eb131e74ef90f87b94a932426cb87cf271f455970dcd1ef75f08c11032cd462a6ef4ce0a1e386093180c998de6464e4f0c05c53fbfdae6a9077d378b46ccc76
+  secret_key_base: a31fd51ce98dbfce145a92c1810145ce224c6a95c36bfd32e4decd5da7db64ea5e7bcfc1b11eb3e620bc0b1e0e08ef189d2a2187c4f417351ae7ea9f6e12452d
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161024154040) do
+ActiveRecord::Schema.define(version: 20161116222940) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

data/test/dummy/log/test.log

@@ -1,65 +1,65 @@
-  ActiveRecord::InternalMetadata Load (0.7ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", :environment], ["LIMIT", 1]]
+  ActiveRecord::InternalMetadata Load (0.3ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", :environment], ["LIMIT", 1]]
    (0.1ms)  BEGIN
-  SQL (0.3ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "test"], ["created_at", 2016-10-24 15:40:29 UTC], ["updated_at", 2016-10-24 15:40:29 UTC]]
-   (0.5ms)  COMMIT
+  SQL (0.3ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "test"], ["created_at", 2016-11-16 22:29:29 UTC], ["updated_at", 2016-11-16 22:29:29 UTC]]
+   (0.6ms)  COMMIT
   ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (0.5ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1  [["key", :environment]]
+   (0.3ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1  [["key", :environment]]
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
    (0.1ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1  [["key", :environment]]
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
    (0.1ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1  [["key", :environment]]
-   (193.6ms)  DROP DATABASE IF EXISTS "dummy_test"
-   (382.9ms)  CREATE DATABASE "dummy_test" ENCODING = 'unicode'
-   (3.9ms)  CREATE TABLE "schema_migrations" ("version" character varying PRIMARY KEY)
-   (2.0ms)  CREATE TABLE "ar_internal_metadata" ("key" character varying PRIMARY KEY, "value" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
-   (0.1ms)  SELECT pg_try_advisory_lock(2735718569030447490);
+   (194.6ms)  DROP DATABASE IF EXISTS "dummy_test"
+   (386.0ms)  CREATE DATABASE "dummy_test" ENCODING = 'unicode'
+   (3.4ms)  CREATE TABLE "schema_migrations" ("version" character varying PRIMARY KEY)
+   (2.2ms)  CREATE TABLE "ar_internal_metadata" ("key" character varying PRIMARY KEY, "value" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
+   (0.2ms)  SELECT pg_try_advisory_lock(2735718569030447490);
   ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to CreatePushTypeUsers (20161024154034)
+Migrating to CreatePushTypeUsers (20161116222934)
    (0.1ms)  BEGIN
-  SQL (12.6ms)  CREATE EXTENSION IF NOT EXISTS "uuid-ossp"
-   (2.3ms)  CREATE TABLE "push_type_users" ("id" uuid DEFAULT uuid_generate_v4() PRIMARY KEY, "name" character varying, "email" character varying, "field_store" jsonb, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
-  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161024154034"]]
-   (0.6ms)  COMMIT
-Migrating to CreatePushTypeNodes (20161024154035)
+  SQL (2.4ms)  CREATE EXTENSION IF NOT EXISTS "uuid-ossp"
+   (2.2ms)  CREATE TABLE "push_type_users" ("id" uuid DEFAULT uuid_generate_v4() PRIMARY KEY, "name" character varying, "email" character varying, "field_store" jsonb, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161116222934"]]
+   (0.7ms)  COMMIT
+Migrating to CreatePushTypeNodes (20161116222935)
    (0.1ms)  BEGIN
    (2.3ms)  CREATE TABLE "push_type_nodes" ("id" uuid DEFAULT uuid_generate_v4() PRIMARY KEY, "type" character varying, "title" character varying, "slug" character varying, "field_store" jsonb, "parent_id" uuid, "sort_order" integer, "status" integer, "published_at" timestamp, "published_to" timestamp, "creator_id" uuid, "updater_id" uuid, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "deleted_at" timestamp)
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161024154035"]]
-   (0.4ms)  COMMIT
-Migrating to CreatePushTypeNodeHierarchies (20161024154036)
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161116222935"]]
+   (0.5ms)  COMMIT
+Migrating to CreatePushTypeNodeHierarchies (20161116222936)
    (0.1ms)  BEGIN
-   (0.5ms)  CREATE TABLE "push_type_node_hierarchies" ("ancestor_id" uuid NOT NULL, "descendant_id" uuid NOT NULL, "generations" integer NOT NULL)
-   (0.8ms)  CREATE UNIQUE INDEX  "node_anc_desc_idx" ON "push_type_node_hierarchies"  ("ancestor_id", "descendant_id", "generations")
-   (0.6ms)  CREATE  INDEX  "node_desc_idx" ON "push_type_node_hierarchies"  ("descendant_id")
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161024154036"]]
-   (0.3ms)  COMMIT
-Migrating to CreatePushTypeAssets (20161024154037)
+   (0.4ms)  CREATE TABLE "push_type_node_hierarchies" ("ancestor_id" uuid NOT NULL, "descendant_id" uuid NOT NULL, "generations" integer NOT NULL)
+   (0.6ms)  CREATE UNIQUE INDEX  "node_anc_desc_idx" ON "push_type_node_hierarchies"  ("ancestor_id", "descendant_id", "generations")
+   (0.5ms)  CREATE  INDEX  "node_desc_idx" ON "push_type_node_hierarchies"  ("descendant_id")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161116222936"]]
+   (0.4ms)  COMMIT
+Migrating to CreatePushTypeAssets (20161116222937)
    (0.1ms)  BEGIN
-   (2.1ms)  CREATE TABLE "push_type_assets" ("id" uuid DEFAULT uuid_generate_v4() PRIMARY KEY, "file_uid" character varying, "file_name" character varying, "file_size" integer, "file_ext" character varying, "mime_type" character varying, "description" character varying, "uploader_id" uuid, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "deleted_at" timestamp)
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161024154037"]]
-   (0.3ms)  COMMIT
-Migrating to AddFieldStoreDefaultValues (20161024154038)
+   (2.0ms)  CREATE TABLE "push_type_assets" ("id" uuid DEFAULT uuid_generate_v4() PRIMARY KEY, "file_uid" character varying, "file_name" character varying, "file_size" integer, "file_ext" character varying, "mime_type" character varying, "description" character varying, "uploader_id" uuid, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "deleted_at" timestamp)
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161116222937"]]
+   (0.4ms)  COMMIT
+Migrating to AddFieldStoreDefaultValues (20161116222938)
    (0.1ms)  BEGIN
-   (0.2ms)  ALTER TABLE "push_type_nodes" ALTER COLUMN "field_store" TYPE jsonb
+   (0.3ms)  ALTER TABLE "push_type_nodes" ALTER COLUMN "field_store" TYPE jsonb
    (0.2ms)  ALTER TABLE "push_type_nodes" ALTER COLUMN "field_store" SET DEFAULT '{}'
    (0.3ms)  UPDATE "push_type_nodes" SET "field_store"='{}' WHERE "field_store" IS NULL
-   (0.1ms)  ALTER TABLE "push_type_nodes" ALTER "field_store" SET NOT NULL
+   (0.2ms)  ALTER TABLE "push_type_nodes" ALTER "field_store" SET NOT NULL
    (0.3ms)  ALTER TABLE "push_type_users" ALTER COLUMN "field_store" TYPE jsonb
    (0.2ms)  ALTER TABLE "push_type_users" ALTER COLUMN "field_store" SET DEFAULT '{}'
    (0.2ms)  UPDATE "push_type_users" SET "field_store"='{}' WHERE "field_store" IS NULL
    (0.2ms)  ALTER TABLE "push_type_users" ALTER "field_store" SET NOT NULL
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161024154038"]]
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161116222938"]]
    (0.4ms)  COMMIT
-Migrating to DropLegacyPushTypeTaxonomies (20161024154039)
+Migrating to DropLegacyPushTypeTaxonomies (20161116222939)
    (0.1ms)  BEGIN
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161024154039"]]
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161116222939"]]
    (0.3ms)  COMMIT
-Migrating to DeviseExtendPushTypeUsers (20161024154040)
+Migrating to DeviseExtendPushTypeUsers (20161116222940)
    (0.1ms)  BEGIN
-   (3.1ms)  ALTER TABLE "push_type_users" ADD "encrypted_password" character varying DEFAULT '' NOT NULL
+   (3.4ms)  ALTER TABLE "push_type_users" ADD "encrypted_password" character varying DEFAULT '' NOT NULL
    (0.2ms)  ALTER TABLE "push_type_users" ADD "reset_password_token" character varying
-   (0.1ms)  ALTER TABLE "push_type_users" ADD "reset_password_sent_at" timestamp
-   (0.2ms)  ALTER TABLE "push_type_users" ADD "remember_created_at" timestamp
-   (2.2ms)  ALTER TABLE "push_type_users" ADD "sign_in_count" integer DEFAULT 0 NOT NULL
+   (0.2ms)  ALTER TABLE "push_type_users" ADD "reset_password_sent_at" timestamp
+   (0.1ms)  ALTER TABLE "push_type_users" ADD "remember_created_at" timestamp
+   (2.3ms)  ALTER TABLE "push_type_users" ADD "sign_in_count" integer DEFAULT 0 NOT NULL
    (0.2ms)  ALTER TABLE "push_type_users" ADD "current_sign_in_at" timestamp
    (0.2ms)  ALTER TABLE "push_type_users" ADD "last_sign_in_at" timestamp
    (0.1ms)  ALTER TABLE "push_type_users" ADD "current_sign_in_ip" character varying
@@ -67,17 +67,17 @@ Migrating to DeviseExtendPushTypeUsers (20161024154040)
    (0.1ms)  ALTER TABLE "push_type_users" ADD "confirmation_token" character varying
    (0.1ms)  ALTER TABLE "push_type_users" ADD "confirmed_at" timestamp
    (0.1ms)  ALTER TABLE "push_type_users" ADD "confirmation_sent_at" timestamp
-   (0.8ms)  CREATE UNIQUE INDEX  "index_push_type_users_on_email" ON "push_type_users"  ("email")
-   (0.7ms)  CREATE UNIQUE INDEX  "index_push_type_users_on_reset_password_token" ON "push_type_users"  ("reset_password_token")
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161024154040"]]
-   (1.0ms)  COMMIT
-  ActiveRecord::InternalMetadata Load (0.3ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", :environment], ["LIMIT", 1]]
+   (0.7ms)  CREATE UNIQUE INDEX  "index_push_type_users_on_email" ON "push_type_users"  ("email")
+   (0.8ms)  CREATE UNIQUE INDEX  "index_push_type_users_on_reset_password_token" ON "push_type_users"  ("reset_password_token")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20161116222940"]]
+   (1.1ms)  COMMIT
+  ActiveRecord::InternalMetadata Load (0.2ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", :environment], ["LIMIT", 1]]
    (0.1ms)  BEGIN
-  SQL (0.3ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "test"], ["created_at", 2016-10-24 15:40:37 UTC], ["updated_at", 2016-10-24 15:40:37 UTC]]
+  SQL (0.3ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "test"], ["created_at", 2016-11-16 22:29:37 UTC], ["updated_at", 2016-11-16 22:29:37 UTC]]
    (0.4ms)  COMMIT
    (0.1ms)  SELECT pg_advisory_unlock(2735718569030447490)
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (1.7ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+   (1.8ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
 FROM pg_constraint c
 JOIN pg_class t1 ON c.conrelid = t1.oid
 JOIN pg_class t2 ON c.confrelid = t2.oid
@@ -113,7 +113,7 @@ WHERE c.contype = 'f'
   AND t3.nspname = ANY (current_schemas(false))
 ORDER BY c.conname
 
-   (1.2ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+   (1.3ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
 FROM pg_constraint c
 JOIN pg_class t1 ON c.conrelid = t1.oid
 JOIN pg_class t2 ON c.confrelid = t2.oid
@@ -128,70 +128,61 @@ ORDER BY c.conname
   ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
 Creating scope :published. Overwriting existing method PushType::Node.published.
    (0.1ms)  BEGIN
-   (0.4ms)  ALTER TABLE "schema_migrations" DISABLE TRIGGER ALL;ALTER TABLE "ar_internal_metadata" DISABLE TRIGGER ALL;ALTER TABLE "push_type_nodes" DISABLE TRIGGER ALL;ALTER TABLE "push_type_node_hierarchies" DISABLE TRIGGER ALL;ALTER TABLE "push_type_assets" DISABLE TRIGGER ALL;ALTER TABLE "push_type_users" DISABLE TRIGGER ALL
+   (0.3ms)  ALTER TABLE "schema_migrations" DISABLE TRIGGER ALL;ALTER TABLE "ar_internal_metadata" DISABLE TRIGGER ALL;ALTER TABLE "push_type_nodes" DISABLE TRIGGER ALL;ALTER TABLE "push_type_node_hierarchies" DISABLE TRIGGER ALL;ALTER TABLE "push_type_assets" DISABLE TRIGGER ALL;ALTER TABLE "push_type_users" DISABLE TRIGGER ALL
    (0.1ms)  COMMIT
-   (1.0ms)            SELECT schemaname || '.' || tablename
+   (0.9ms)            SELECT schemaname || '.' || tablename
           FROM pg_tables
           WHERE
             tablename !~ '_prt_' AND
             tablename <> 'schema_migrations' AND
             schemaname = ANY (current_schemas(false))
 
-   (0.9ms)  select table_name from information_schema.views where table_schema = 'dummy_test'
-   (9.4ms)  TRUNCATE TABLE "public"."ar_internal_metadata", "public"."push_type_nodes", "public"."push_type_node_hierarchies", "public"."push_type_assets", "public"."push_type_users" RESTART IDENTITY CASCADE;
+   (1.0ms)  select table_name from information_schema.views where table_schema = 'dummy_test'
+   (9.1ms)  TRUNCATE TABLE "public"."ar_internal_metadata", "public"."push_type_nodes", "public"."push_type_node_hierarchies", "public"."push_type_assets", "public"."push_type_users" RESTART IDENTITY CASCADE;
    (0.1ms)  BEGIN
-   (0.3ms)  ALTER TABLE "schema_migrations" ENABLE TRIGGER ALL;ALTER TABLE "ar_internal_metadata" ENABLE TRIGGER ALL;ALTER TABLE "push_type_node_hierarchies" ENABLE TRIGGER ALL;ALTER TABLE "push_type_assets" ENABLE TRIGGER ALL;ALTER TABLE "push_type_users" ENABLE TRIGGER ALL;ALTER TABLE "push_type_nodes" ENABLE TRIGGER ALL
+   (0.4ms)  ALTER TABLE "schema_migrations" ENABLE TRIGGER ALL;ALTER TABLE "ar_internal_metadata" ENABLE TRIGGER ALL;ALTER TABLE "push_type_node_hierarchies" ENABLE TRIGGER ALL;ALTER TABLE "push_type_assets" ENABLE TRIGGER ALL;ALTER TABLE "push_type_users" ENABLE TRIGGER ALL;ALTER TABLE "push_type_nodes" ENABLE TRIGGER ALL
    (0.1ms)  COMMIT
    (0.1ms)  BEGIN
---------------------------------------------------------------------------------------
-PushType::AuthenticatableTest::#password_required?::with new user: test_0001_anonymous
---------------------------------------------------------------------------------------
+----------------------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::GET #show::with valid confirmation token: test_0002_anonymous
+----------------------------------------------------------------------------------------------------
    (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
---------------------------------------------------------------------------------------------------------------
-PushType::AuthenticatableTest::#password_required?::with existing user and clean password: test_0001_anonymous
---------------------------------------------------------------------------------------------------------------
    (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.6ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-1@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-1@example.com"], ["LIMIT", 1]]
-  SQL (1.0ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-1@example.com"], ["created_at", 2016-10-24 15:40:41 UTC], ["updated_at", 2016-10-24 15:40:41 UTC], ["confirmation_token", "475WAFX6Tn2Aoxa5jdhZ"], ["confirmation_sent_at", 2016-10-24 15:40:41 UTC]]
+  PushType::User Exists (0.5ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-1@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-1@example.com"], ["LIMIT", 1]]
+  SQL (1.0ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-1@example.com"], ["created_at", 2016-11-16 22:29:41 UTC], ["updated_at", 2016-11-16 22:29:41 UTC], ["confirmation_token", "T2-C8WuzQekkzGw8Cr-p"], ["confirmation_sent_at", 2016-11-16 22:29:41 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (5.0ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (4.7ms)
 DEPRECATION WARNING on line 78 of /Users/aaron/.rvm/gems/ruby-2.3.1@push_type/gems/foundation-rails-5.5.3.2/vendor/assets/stylesheets/foundation/components/_top-bar.scss: #{} interpolation near operators will be simplified
 in a future version of Sass. To preserve the current behavior, use quotes:
 
   unquote("#{lower-bound($medium-range)}")
 
 
-Devise::Mailer#confirmation_instructions: processed outbound mail in 12820.0ms
-Sent mail to joe-1@example.com (10.7ms)
-Date: Mon, 24 Oct 2016 16:40:54 +0100
+Devise::Mailer#confirmation_instructions: processed outbound mail in 12636.8ms
+Sent mail to joe-1@example.com (11.5ms)
+Date: Wed, 16 Nov 2016 22:29:54 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
 To: joe-1@example.com
-Message-ID: <580e2b8649ce_1031a3fd81583f9c852997@Aarons-iMac.local.mail>
+Message-ID: <582cdde25143a_32783fe28d43f9b8844ee@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b863244_1031a3fd81583f9c85286c";
+ boundary="--==_mimepart_582cdde24fb65_32783fe28d43f9b884365";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b863244_1031a3fd81583f9c85286c
+----==_mimepart_582cdde24fb65_32783fe28d43f9b884365
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -202,11 +193,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=475WAFX6Tn2Aoxa5jdhZ )
+( http://localhost:3000/admin/users/confirmation.cd4f117d-29e0-407d-86b0-7f1ce14392b5?confirmation_token=T2-C8WuzQekkzGw8Cr-p )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b863244_1031a3fd81583f9c85286c
+----==_mimepart_582cdde24fb65_32783fe28d43f9b884365
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -239,7 +230,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -252,7 +243,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=475WAFX6Tn2Aoxa5jdhZ" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.cd4f117d-29e0-407d-86b0-7f1ce14392b5?confirmation_token=T2-C8WuzQekkzGw8Cr-p" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -297,118 +288,52 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b863244_1031a3fd81583f9c85286c--
+----==_mimepart_582cdde24fb65_32783fe28d43f9b884365--
 
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+Processing by PushType::ConfirmationsController#show as HTML
+  Parameters: {"confirmation_token"=>"T2-C8WuzQekkzGw8Cr-p"}
+  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "T2-C8WuzQekkzGw8Cr-p"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (1.3ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (23.0ms)
+Completed 200 OK in 37ms (Views: 31.7ms | ActiveRecord: 0.4ms)
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.2ms)  ROLLBACK
    (0.1ms)  BEGIN
----------------------------------------------------------------
-PushType::AuthenticatableTest::confirmable: test_0001_anonymous
----------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
--------------------------------------------------------------
-PushType::AuthenticatableTest::trackable: test_0001_anonymous
--------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
+----------------------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::GET #show::with valid confirmation token: test_0001_anonymous
+----------------------------------------------------------------------------------------------------
    (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
--------------------------------------------------------------------------------------
-PushType::ProfilesControllerTest::PUT #update::with invalid user: test_0002_anonymous
--------------------------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-2@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-2@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-2@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-10-24 15:40:54 UTC], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::ProfilesController#update as HTML
-  Parameters: {"user"=>{"name"=>""}}
-  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "1caa4430-1b0a-4c50-a487-3cfaf3b8b08a"], ["LIMIT", 1]]
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-2@example.com"], ["id", "1caa4430-1b0a-4c50-a487-3cfaf3b8b08a"], ["LIMIT", 1]]
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_2
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin (15.6ms)
-Completed 200 OK in 37ms (Views: 30.8ms | ActiveRecord: 0.8ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
--------------------------------------------------------------------------------------
-PushType::ProfilesControllerTest::PUT #update::with invalid user: test_0001_anonymous
--------------------------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-3@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-3@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-3@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-10-24 15:40:54 UTC], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::ProfilesController#update as HTML
-  Parameters: {"user"=>{"name"=>""}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "d0ffc7ac-bbed-4672-a05b-1bc315a9cfbd"], ["LIMIT", 1]]
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-3@example.com"], ["id", "d0ffc7ac-bbed-4672-a05b-1bc315a9cfbd"], ["LIMIT", 1]]
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_2
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin (1.9ms)
-Completed 200 OK in 12ms (Views: 8.4ms | ActiveRecord: 0.5ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
-----------------------------------------------------
-PushType::InvitationMethodsTest: test_0001_anonymous
-----------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK
-   (0.0ms)  BEGIN
-------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0001_anonymous
-------------------------------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-4@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-4@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-4@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "icg3jcN6HeMVxsjJKWV6"], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-2@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-2@example.com"], ["LIMIT", 1]]
+  SQL (0.3ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-2@example.com"], ["created_at", 2016-11-16 22:29:54 UTC], ["updated_at", 2016-11-16 22:29:54 UTC], ["confirmation_token", "Sda5mT5CA-VhKy3rVmrm"], ["confirmation_sent_at", 2016-11-16 22:29:54 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 3.2ms
-Sent mail to joe-4@example.com (3.4ms)
-Date: Mon, 24 Oct 2016 16:40:54 +0100
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.4ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.0ms
+Sent mail to joe-2@example.com (3.6ms)
+Date: Wed, 16 Nov 2016 22:29:54 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-4@example.com
-Message-ID: <580e2b862717a_1031a3fd81583f9c8532f1@Aarons-iMac.local.mail>
+To: joe-2@example.com
+Message-ID: <582cdde26700a_32783fe28d43f9b88474b@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b8626d34_1031a3fd81583f9c853134";
+ boundary="--==_mimepart_582cdde266b4c_32783fe28d43f9b88462";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b8626d34_1031a3fd81583f9c853134
+----==_mimepart_582cdde266b4c_32783fe28d43f9b88462
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -419,11 +344,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=icg3jcN6HeMVxsjJKWV6 )
+( http://localhost:3000/admin/users/confirmation.a3fa999f-6b93-40c1-bf6b-c8c9783a6799?confirmation_token=Sda5mT5CA-VhKy3rVmrm )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b8626d34_1031a3fd81583f9c853134
+----==_mimepart_582cdde266b4c_32783fe28d43f9b88462
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -456,7 +381,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -469,7 +394,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=icg3jcN6HeMVxsjJKWV6" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.a3fa999f-6b93-40c1-bf6b-c8c9783a6799?confirmation_token=Sda5mT5CA-VhKy3rVmrm" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -514,53 +439,93 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b8626d34_1031a3fd81583f9c853134--
+----==_mimepart_582cdde266b4c_32783fe28d43f9b88462--
 
-Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"icg3jcN6HeMVxsjJKWV6", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "icg3jcN6HeMVxsjJKWV6"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-4@example.com"], ["id", "05060a5a-b14e-464a-864a-567a4c9ea21b"], ["LIMIT", 1]]
+Processing by PushType::ConfirmationsController#show as HTML
+  Parameters: {"confirmation_token"=>"Sda5mT5CA-VhKy3rVmrm"}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "Sda5mT5CA-VhKy3rVmrm"], ["LIMIT", 1]]
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (1.0ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (7.5ms)
-Completed 200 OK in 20ms (Views: 16.9ms | ActiveRecord: 0.5ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.3ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (1.6ms)
+Completed 200 OK in 7ms (Views: 5.7ms | ActiveRecord: 0.2ms)
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
-------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0002_anonymous
-------------------------------------------------------------------------------------------
+-----------------------------------------------------------
+PushType::ApiAuthenticationMethodsTest: test_0001_anonymous
+-----------------------------------------------------------
    (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------
+PushType::ApiAuthenticationMethodsTest: test_0004_anonymous
+-----------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------
+PushType::ApiAuthenticationMethodsTest: test_0002_anonymous
+-----------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------
+PushType::ApiAuthenticationMethodsTest: test_0003_anonymous
+-----------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------------------------
+PushType::Admin::UsersControllerTest::PUT #invite: test_0001_anonymous
+----------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-5@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-5@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-5@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "unEz_3cioUiZktDcgQz5"], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-3@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-3@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-3@example.com"], ["created_at", 2016-11-16 22:29:54 UTC], ["updated_at", 2016-11-16 22:29:54 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-11-16 22:29:54 UTC], ["confirmation_sent_at", 2016-11-16 22:29:54 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-4@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-4@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-4@example.com"], ["created_at", 2016-11-16 22:29:54 UTC], ["updated_at", 2016-11-16 22:29:54 UTC], ["confirmation_token", "_p5fhGyK8P7vftmPHBra"], ["confirmation_sent_at", 2016-11-16 22:29:54 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 2.6ms
-Sent mail to joe-5@example.com (3.6ms)
-Date: Mon, 24 Oct 2016 16:40:54 +0100
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.5ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 4.1ms
+Sent mail to joe-4@example.com (4.2ms)
+Date: Wed, 16 Nov 2016 22:29:54 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-5@example.com
-Message-ID: <580e2b86369c8_1031a3fd81583f9c853586@Aarons-iMac.local.mail>
+To: joe-4@example.com
+Message-ID: <582cdde276349_32783fe28d43f9b88505d@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b8636560_1031a3fd81583f9c8534db";
+ boundary="--==_mimepart_582cdde275cdd_32783fe28d43f9b884960";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b8636560_1031a3fd81583f9c8534db
+----==_mimepart_582cdde275cdd_32783fe28d43f9b884960
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -571,11 +536,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=unEz_3cioUiZktDcgQz5 )
+( http://localhost:3000/admin/users/confirmation.2257d566-0459-4662-84ec-6c82bbc27c1c?confirmation_token=_p5fhGyK8P7vftmPHBra )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b8636560_1031a3fd81583f9c8534db
+----==_mimepart_582cdde275cdd_32783fe28d43f9b884960
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -608,7 +573,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -621,7 +586,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=unEz_3cioUiZktDcgQz5" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.2257d566-0459-4662-84ec-6c82bbc27c1c?confirmation_token=_p5fhGyK8P7vftmPHBra" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -666,53 +631,37 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b8636560_1031a3fd81583f9c8534db--
+----==_mimepart_582cdde275cdd_32783fe28d43f9b884960--
 
-Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"unEz_3cioUiZktDcgQz5", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
-  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "unEz_3cioUiZktDcgQz5"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-5@example.com"], ["id", "b2636154-a86c-4a3e-b67d-4208210b8dca"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.4ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (2.1ms)
-Completed 200 OK in 9ms (Views: 6.2ms | ActiveRecord: 0.5ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
-------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0003_anonymous
-------------------------------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_1
+Processing by PushType::Admin::UsersController#invite as HTML
+  Parameters: {"id"=>"2257d566-0459-4662-84ec-6c82bbc27c1c"}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "317ad30e-9960-4250-9457-1dc6d5305c3b"], ["LIMIT", 1]]
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "2257d566-0459-4662-84ec-6c82bbc27c1c"], ["LIMIT", 1]]
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-6@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-6@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-6@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "Znz5pgMjo-V1GrR9gXBe"], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
   Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 3.0ms
-Sent mail to joe-6@example.com (4.0ms)
-Date: Mon, 24 Oct 2016 16:40:54 +0100
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.8ms
+Sent mail to joe-4@example.com (4.4ms)
+Date: Wed, 16 Nov 2016 22:29:54 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-6@example.com
-Message-ID: <580e2b8644197_1031a3fd81583f9c8538a7@Aarons-iMac.local.mail>
+To: joe-4@example.com
+Message-ID: <582cdde281a91_32783fe28d43f9b88539a@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b8643cb4_1031a3fd81583f9c8537e2";
+ boundary="--==_mimepart_582cdde28162e_32783fe28d43f9b885273";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b8643cb4_1031a3fd81583f9c8537e2
+----==_mimepart_582cdde28162e_32783fe28d43f9b885273
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -723,11 +672,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=Znz5pgMjo-V1GrR9gXBe )
+( http://localhost:3000/admin/users/confirmation.2257d566-0459-4662-84ec-6c82bbc27c1c?confirmation_token=_p5fhGyK8P7vftmPHBra )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b8643cb4_1031a3fd81583f9c8537e2
+----==_mimepart_582cdde28162e_32783fe28d43f9b885273
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -760,7 +709,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -773,7 +722,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=Znz5pgMjo-V1GrR9gXBe" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.2257d566-0459-4662-84ec-6c82bbc27c1c?confirmation_token=_p5fhGyK8P7vftmPHBra" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -818,150 +767,52 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b8643cb4_1031a3fd81583f9c8537e2--
+----==_mimepart_582cdde28162e_32783fe28d43f9b885273--
 
-Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"Znz5pgMjo-V1GrR9gXBe", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "Znz5pgMjo-V1GrR9gXBe"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-6@example.com"], ["id", "dffd0b57-a637-4a4a-84cc-c53f0acfec9a"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.4ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (2.2ms)
-Completed 200 OK in 11ms (Views: 7.3ms | ActiveRecord: 0.5ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
-----------------------------------------------------------------
-PushType::AuthenticatableTest::rememberable: test_0001_anonymous
-----------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
----------------------------------------------------------------
-PushType::AuthenticatableTest::validatable: test_0001_anonymous
----------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
----------------------------------------------------------------
-PushType::AuthenticatableTest::validatable: test_0002_anonymous
----------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
+Redirected to http://test.host/push_type/users
+Completed 302 Found in 43ms (ActiveRecord: 0.5ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
------------------------------------------------------------------------------------
-PushType::ProfilesControllerTest::PUT #update::with valid user: test_0002_anonymous
------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
+----------------------------------------------------------------------
+PushType::Admin::UsersControllerTest::PUT #invite: test_0003_anonymous
+----------------------------------------------------------------------
    (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-7@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-7@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-7@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-10-24 15:40:54 UTC], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::ProfilesController#update as HTML
-  Parameters: {"user"=>{"name"=>"Test user ABC"}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "3321fe3e-e678-40f7-8817-8799d2dee7af"], ["LIMIT", 1]]
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-7@example.com"], ["id", "3321fe3e-e678-40f7-8817-8799d2dee7af"], ["LIMIT", 1]]
-  SQL (0.2ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", 2016-10-24 15:40:54 UTC], ["id", "3321fe3e-e678-40f7-8817-8799d2dee7af"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Redirected to http://test.host/push_type/profile/edit
-Completed 302 Found in 6ms (ActiveRecord: 0.9ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
------------------------------------------------------------------------------------
-PushType::ProfilesControllerTest::PUT #update::with valid user: test_0001_anonymous
------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-8@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-8@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-8@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-10-24 15:40:54 UTC], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::ProfilesController#update as HTML
-  Parameters: {"user"=>{"name"=>"Test user ABC"}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "b7730ea5-8138-4101-aa48-f740b1432727"], ["LIMIT", 1]]
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-8@example.com"], ["id", "b7730ea5-8138-4101-aa48-f740b1432727"], ["LIMIT", 1]]
-  SQL (0.2ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", 2016-10-24 15:40:54 UTC], ["id", "b7730ea5-8138-4101-aa48-f740b1432727"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Redirected to http://test.host/push_type/profile/edit
-Completed 302 Found in 5ms (ActiveRecord: 0.7ms)
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 LIMIT $2  [["id", "b7730ea5-8138-4101-aa48-f740b1432727"], ["LIMIT", 1]]
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
------------------------------------------------------------------------------------
-PushType::ProfilesControllerTest::PUT #update::with valid user: test_0003_anonymous
------------------------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-9@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-9@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-9@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-10-24 15:40:54 UTC], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::ProfilesController#update as HTML
-  Parameters: {"user"=>{"name"=>"Test user ABC"}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "a973dae2-3e76-48e9-b89d-5cf3a32093a0"], ["LIMIT", 1]]
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-9@example.com"], ["id", "a973dae2-3e76-48e9-b89d-5cf3a32093a0"], ["LIMIT", 1]]
-  SQL (0.2ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", 2016-10-24 15:40:54 UTC], ["id", "a973dae2-3e76-48e9-b89d-5cf3a32093a0"]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-5@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-5@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-5@example.com"], ["created_at", 2016-11-16 22:29:54 UTC], ["updated_at", 2016-11-16 22:29:54 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-11-16 22:29:54 UTC], ["confirmation_sent_at", 2016-11-16 22:29:54 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-Redirected to http://test.host/push_type/profile/edit
-Completed 302 Found in 5ms (ActiveRecord: 0.7ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
-----------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::PUT #update::with valid user: test_0002_anonymous
-----------------------------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-10@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-10@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-10@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "RpHwvF9m5kdxGSW1BK-D"], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-6@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-6@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-6@example.com"], ["created_at", 2016-11-16 22:29:54 UTC], ["updated_at", 2016-11-16 22:29:54 UTC], ["confirmation_token", "ULSyydis9zoYHN3nLFVJ"], ["confirmation_sent_at", 2016-11-16 22:29:54 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
   Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 3.0ms
-Sent mail to joe-10@example.com (3.9ms)
-Date: Mon, 24 Oct 2016 16:40:54 +0100
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.5ms
+Sent mail to joe-6@example.com (3.5ms)
+Date: Wed, 16 Nov 2016 22:29:54 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-10@example.com
-Message-ID: <580e2b865c180_1031a3fd81583f9c8541c2@Aarons-iMac.local.mail>
+To: joe-6@example.com
+Message-ID: <582cdde28d3b5_32783fe28d43f9b8856b2@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b865bcaa_1031a3fd81583f9c85406c";
+ boundary="--==_mimepart_582cdde28cf00_32783fe28d43f9b885557";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b865bcaa_1031a3fd81583f9c85406c
+----==_mimepart_582cdde28cf00_32783fe28d43f9b885557
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -972,11 +823,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=RpHwvF9m5kdxGSW1BK-D )
+( http://localhost:3000/admin/users/confirmation.89fac987-1ca1-479c-9780-7265dcf0e619?confirmation_token=ULSyydis9zoYHN3nLFVJ )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b865bcaa_1031a3fd81583f9c85406c
+----==_mimepart_582cdde28cf00_32783fe28d43f9b885557
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1009,7 +860,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -1022,7 +873,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=RpHwvF9m5kdxGSW1BK-D" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.89fac987-1ca1-479c-9780-7265dcf0e619?confirmation_token=ULSyydis9zoYHN3nLFVJ" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -1067,57 +918,37 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b865bcaa_1031a3fd81583f9c85406c--
+----==_mimepart_582cdde28cf00_32783fe28d43f9b885557--
 
-Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"RpHwvF9m5kdxGSW1BK-D", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
-  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "RpHwvF9m5kdxGSW1BK-D"], ["LIMIT", 1]]
-  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-10@example.com"], ["id", "6d6ff75c-5ced-4cf2-8462-217d611e7d92"], ["LIMIT", 1]]
-   (0.1ms)  SAVEPOINT active_record_2
-  SQL (0.3ms)  UPDATE "push_type_users" SET "encrypted_password" = $1, "confirmed_at" = $2, "updated_at" = $3 WHERE "push_type_users"."id" = $4  [["encrypted_password", "$2a$04$kEzVfcE4UaLj0kRW1jLUv.REX0UtSBA85oG/n.veYCBkgu/5XyDjK"], ["confirmed_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["id", "6d6ff75c-5ced-4cf2-8462-217d611e7d92"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-   (0.1ms)  SAVEPOINT active_record_2
-  SQL (0.2ms)  UPDATE "push_type_users" SET "updated_at" = $1, "sign_in_count" = $2, "current_sign_in_at" = $3, "last_sign_in_at" = $4, "current_sign_in_ip" = $5, "last_sign_in_ip" = $6 WHERE "push_type_users"."id" = $7  [["updated_at", 2016-10-24 15:40:54 UTC], ["sign_in_count", 1], ["current_sign_in_at", 2016-10-24 15:40:54 UTC], ["last_sign_in_at", 2016-10-24 15:40:54 UTC], ["current_sign_in_ip", "0.0.0.0"], ["last_sign_in_ip", "0.0.0.0"], ["id", "6d6ff75c-5ced-4cf2-8462-217d611e7d92"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Redirected to http://test.host/push_type/
-Completed 302 Found in 38ms (ActiveRecord: 1.4ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
-----------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::PUT #update::with valid user: test_0001_anonymous
-----------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_1
+Processing by PushType::Admin::UsersController#invite as HTML
+  Parameters: {"id"=>"89fac987-1ca1-479c-9780-7265dcf0e619"}
+  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "2d10b16e-e6bc-40ab-a5b5-b71cdcde21af"], ["LIMIT", 1]]
+  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "89fac987-1ca1-479c-9780-7265dcf0e619"], ["LIMIT", 1]]
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-11@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-11@example.com"], ["LIMIT", 1]]
-  SQL (0.3ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-11@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "4AcBbE2Vs2FuGdzY-S4C"], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
   Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 2.8ms
-Sent mail to joe-11@example.com (3.7ms)
-Date: Mon, 24 Oct 2016 16:40:54 +0100
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.6ms
+Sent mail to joe-6@example.com (3.9ms)
+Date: Wed, 16 Nov 2016 22:29:54 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-11@example.com
-Message-ID: <580e2b8670f96_1031a3fd81583f9c85442b@Aarons-iMac.local.mail>
+To: joe-6@example.com
+Message-ID: <582cdde297c1b_32783fe28d43f9b885932@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b8670b15_1031a3fd81583f9c85431a";
+ boundary="--==_mimepart_582cdde297791_32783fe28d43f9b885866";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b8670b15_1031a3fd81583f9c85431a
+----==_mimepart_582cdde297791_32783fe28d43f9b885866
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -1128,11 +959,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=4AcBbE2Vs2FuGdzY-S4C )
+( http://localhost:3000/admin/users/confirmation.89fac987-1ca1-479c-9780-7265dcf0e619?confirmation_token=ULSyydis9zoYHN3nLFVJ )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b8670b15_1031a3fd81583f9c85431a
+----==_mimepart_582cdde297791_32783fe28d43f9b885866
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1165,7 +996,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -1178,7 +1009,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=4AcBbE2Vs2FuGdzY-S4C" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.89fac987-1ca1-479c-9780-7265dcf0e619?confirmation_token=ULSyydis9zoYHN3nLFVJ" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -1223,96 +1054,52 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b8670b15_1031a3fd81583f9c85431a--
+----==_mimepart_582cdde297791_32783fe28d43f9b885866--
 
-Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"4AcBbE2Vs2FuGdzY-S4C", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
-  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "4AcBbE2Vs2FuGdzY-S4C"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-11@example.com"], ["id", "519b79b2-6f1f-4ae9-9e15-7ad4dc47d412"], ["LIMIT", 1]]
-   (0.1ms)  SAVEPOINT active_record_2
-  SQL (0.2ms)  UPDATE "push_type_users" SET "encrypted_password" = $1, "confirmed_at" = $2, "updated_at" = $3 WHERE "push_type_users"."id" = $4  [["encrypted_password", "$2a$04$uVuZsSWksZ8m/CvDN./.z.37HsOvRa7WMZwTlTg2iNXljdz0l9NAi"], ["confirmed_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["id", "519b79b2-6f1f-4ae9-9e15-7ad4dc47d412"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-   (0.1ms)  SAVEPOINT active_record_2
-  SQL (0.2ms)  UPDATE "push_type_users" SET "updated_at" = $1, "sign_in_count" = $2, "current_sign_in_at" = $3, "last_sign_in_at" = $4, "current_sign_in_ip" = $5, "last_sign_in_ip" = $6 WHERE "push_type_users"."id" = $7  [["updated_at", 2016-10-24 15:40:54 UTC], ["sign_in_count", 1], ["current_sign_in_at", 2016-10-24 15:40:54 UTC], ["last_sign_in_at", 2016-10-24 15:40:54 UTC], ["current_sign_in_ip", "0.0.0.0"], ["last_sign_in_ip", "0.0.0.0"], ["id", "519b79b2-6f1f-4ae9-9e15-7ad4dc47d412"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Redirected to http://test.host/push_type/
-Completed 302 Found in 8ms (ActiveRecord: 1.3ms)
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 LIMIT $2  [["id", "519b79b2-6f1f-4ae9-9e15-7ad4dc47d412"], ["LIMIT", 1]]
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
-----------------------------------------------------------------
-PushType::ProfilesControllerTest::GET #edit: test_0001_anonymous
-----------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-12@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-12@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-12@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-10-24 15:40:54 UTC], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::ProfilesController#edit as HTML
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "0639674a-6504-43ed-9bbd-ba2d7bf95e6c"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin (1.9ms)
-Completed 200 OK in 11ms (Views: 9.1ms | ActiveRecord: 0.2ms)
+Redirected to http://test.host/push_type/users
+Completed 302 Found in 43ms (ActiveRecord: 0.7ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
-----------------------------------------------------------------
-PushType::ProfilesControllerTest::GET #edit: test_0002_anonymous
-----------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
+----------------------------------------------------------------------
+PushType::Admin::UsersControllerTest::PUT #invite: test_0002_anonymous
+----------------------------------------------------------------------
    (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-13@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-13@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-13@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-10-24 15:40:54 UTC], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-7@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-7@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-7@example.com"], ["created_at", 2016-11-16 22:29:54 UTC], ["updated_at", 2016-11-16 22:29:54 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-11-16 22:29:54 UTC], ["confirmation_sent_at", 2016-11-16 22:29:54 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::ProfilesController#edit as HTML
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "12e9ec75-e618-4766-afdc-0e6d692775b6"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin (1.9ms)
-Completed 200 OK in 10ms (Views: 8.3ms | ActiveRecord: 0.1ms)
-   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
---------------------------------------------------------------------------------------------------------------
-PushType::AuthenticatableTest::#password_required?::with existing user and dirty password: test_0001_anonymous
---------------------------------------------------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-14@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-14@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-14@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "v-9vusuAYZaqYcjU-WY5"], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-8@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-8@example.com"], ["LIMIT", 1]]
+  SQL (0.4ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-8@example.com"], ["created_at", 2016-11-16 22:29:54 UTC], ["updated_at", 2016-11-16 22:29:54 UTC], ["confirmation_token", "Y29N2DnHQWhm4xvKcQ18"], ["confirmation_sent_at", 2016-11-16 22:29:54 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 3.2ms
-Sent mail to joe-14@example.com (3.9ms)
-Date: Mon, 24 Oct 2016 16:40:54 +0100
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.4ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.0ms
+Sent mail to joe-8@example.com (3.5ms)
+Date: Wed, 16 Nov 2016 22:29:54 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-14@example.com
-Message-ID: <580e2b86879b7_1031a3fd81583f9c85470@Aarons-iMac.local.mail>
+To: joe-8@example.com
+Message-ID: <582cdde2a449b_32783fe28d43f9b886249@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b8687551_1031a3fd81583f9c8546e8";
+ boundary="--==_mimepart_582cdde2a4011_32783fe28d43f9b8861e9";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b8687551_1031a3fd81583f9c8546e8
+----==_mimepart_582cdde2a4011_32783fe28d43f9b8861e9
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -1323,11 +1110,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=v-9vusuAYZaqYcjU-WY5 )
+( http://localhost:3000/admin/users/confirmation.63409346-2eee-45c5-b8e3-37447054b6db?confirmation_token=Y29N2DnHQWhm4xvKcQ18 )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b8687551_1031a3fd81583f9c8546e8
+----==_mimepart_582cdde2a4011_32783fe28d43f9b8861e9
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1360,7 +1147,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -1373,7 +1160,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=v-9vusuAYZaqYcjU-WY5" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.63409346-2eee-45c5-b8e3-37447054b6db?confirmation_token=Y29N2DnHQWhm4xvKcQ18" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -1418,126 +1205,37 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b8687551_1031a3fd81583f9c8546e8--
+----==_mimepart_582cdde2a4011_32783fe28d43f9b8861e9--
 
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
----------------------------------------------------------------
-PushType::AuthenticatableTest::recoverable: test_0001_anonymous
----------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.0ms)  BEGIN
---------------------------------------------------------
-PushType::AuthenticationMethodsTest: test_0001_anonymous
---------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK
-   (0.1ms)  BEGIN
---------------------------------------------------------
-PushType::AuthenticationMethodsTest: test_0002_anonymous
---------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK
-   (0.0ms)  BEGIN
-------------------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::GET #show::with invalid confirmation token: test_0001_anonymous
-------------------------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-Processing by PushType::ConfirmationsController#show as HTML
-  Parameters: {"confirmation_token"=>"invalid"}
-  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "033cdc09555ab47b1c213151a9bbce9c93462f3b69ff016adecbdecddcade626"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.3ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth (3.0ms)
-Completed 200 OK in 189ms (Views: 9.4ms | ActiveRecord: 0.6ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
-------------------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::GET #show::with invalid confirmation token: test_0002_anonymous
-------------------------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-Processing by PushType::ConfirmationsController#show as HTML
-  Parameters: {"confirmation_token"=>"invalid"}
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "033cdc09555ab47b1c213151a9bbce9c93462f3b69ff016adecbdecddcade626"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.3ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth (1.3ms)
-Completed 200 OK in 8ms (Views: 4.8ms | ActiveRecord: 0.4ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
----------------------------------------------------------------------------
-PushType::AuthenticatableTest::database_athenticatable: test_0001_anonymous
----------------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
----------------------------------------------------------------------------
-PushType::AuthenticatableTest::database_athenticatable: test_0002_anonymous
----------------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
-----------------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::GET #show::with valid confirmation token: test_0002_anonymous
-----------------------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-15@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-15@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-15@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "NsTjP2WbeZEhJuvtfttf"], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
+Processing by PushType::Admin::UsersController#invite as HTML
+  Parameters: {"id"=>"63409346-2eee-45c5-b8e3-37447054b6db"}
+  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "1526a3a3-0812-45ce-80c9-68b05aff5568"], ["LIMIT", 1]]
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "63409346-2eee-45c5-b8e3-37447054b6db"], ["LIMIT", 1]]
+   (0.1ms)  SAVEPOINT active_record_2
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.2ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 2.4ms
-Sent mail to joe-15@example.com (3.7ms)
-Date: Mon, 24 Oct 2016 16:40:54 +0100
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.5ms
+Sent mail to joe-8@example.com (3.5ms)
+Date: Wed, 16 Nov 2016 22:29:54 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-15@example.com
-Message-ID: <580e2b86c7aca_1031a3fd81583f9c855063@Aarons-iMac.local.mail>
+To: joe-8@example.com
+Message-ID: <582cdde2aeedf_32783fe28d43f9b886565@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b86c766f_1031a3fd81583f9c854988";
+ boundary="--==_mimepart_582cdde2aeaa8_32783fe28d43f9b886414";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b86c766f_1031a3fd81583f9c854988
+----==_mimepart_582cdde2aeaa8_32783fe28d43f9b886414
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -1548,11 +1246,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=NsTjP2WbeZEhJuvtfttf )
+( http://localhost:3000/admin/users/confirmation.63409346-2eee-45c5-b8e3-37447054b6db?confirmation_token=Y29N2DnHQWhm4xvKcQ18 )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b86c766f_1031a3fd81583f9c854988
+----==_mimepart_582cdde2aeaa8_32783fe28d43f9b886414
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1585,7 +1283,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -1598,7 +1296,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=NsTjP2WbeZEhJuvtfttf" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.63409346-2eee-45c5-b8e3-37447054b6db?confirmation_token=Y29N2DnHQWhm4xvKcQ18" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -1643,52 +1341,84 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b86c766f_1031a3fd81583f9c854988--
+----==_mimepart_582cdde2aeaa8_32783fe28d43f9b886414--
 
-Processing by PushType::ConfirmationsController#show as HTML
-  Parameters: {"confirmation_token"=>"NsTjP2WbeZEhJuvtfttf"}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "NsTjP2WbeZEhJuvtfttf"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.4ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (1.8ms)
-Completed 200 OK in 7ms (Views: 6.2ms | ActiveRecord: 0.2ms)
+Redirected to http://test.host/push_type/users
+Completed 302 Found in 43ms (ActiveRecord: 0.6ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
-----------------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::GET #show::with valid confirmation token: test_0001_anonymous
-----------------------------------------------------------------------------------------------------
+   (0.0ms)  BEGIN
+-----------------------------------------------------------------------------------
+AuthenticatedApiControllerTest::authenticated with token param: test_0001_anonymous
+-----------------------------------------------------------------------------------
    (0.0ms)  SAVEPOINT active_record_1
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-16@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-16@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-16@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "k5K-zeQYbxjgBB1v2FQz"], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-9@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-9@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-9@example.com"], ["created_at", 2016-11-16 22:29:54 UTC], ["updated_at", 2016-11-16 22:29:54 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-11-16 22:29:54 UTC], ["confirmation_sent_at", 2016-11-16 22:29:54 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Started GET "/api/nodes?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE0Nzk0MjE3OTQsInN1YiI6IjNjNGYxZGRjLWMzMDktNDMxYS05MWE1LWZiNTc3NDQ3NDdiYyJ9.5vpdy4qvaITEglYqX9ezfCYNuUpR35ev_fPVP4b19_4" for 127.0.0.1 at 2016-11-16 22:29:54 +0000
+Processing by PushType::Api::NodesController#index as JSON
+  Parameters: {"token"=>"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE0Nzk0MjE3OTQsInN1YiI6IjNjNGYxZGRjLWMzMDktNDMxYS05MWE1LWZiNTc3NDQ3NDdiYyJ9.5vpdy4qvaITEglYqX9ezfCYNuUpR35ev_fPVP4b19_4"}
+  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "3c4f1ddc-c309-431a-91a5-fb57744747bc"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/nodes/index.json.jbuilder
+  PushType::Node Load (0.5ms)  SELECT  "push_type_nodes".* FROM "push_type_nodes" WHERE "push_type_nodes"."parent_id" IS NULL AND "push_type_nodes"."deleted_at" IS NULL ORDER BY sort_order LIMIT $1 OFFSET $2  [["LIMIT", 30], ["OFFSET", 0]]
+  Rendered collection of /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/shared/_pagination.json.jbuilder [0 times] (0.0ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/nodes/index.json.jbuilder (6.7ms)
+Completed 200 OK in 51ms (Views: 33.9ms | ActiveRecord: 0.8ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+-------------------------------------------------------------------------
+AuthenticatedControllerTest::unauthenticated request: test_0001_anonymous
+-------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+Started GET "/admin/nodes" for 127.0.0.1 at 2016-11-16 22:29:54 +0000
+Processing by PushType::Admin::NodesController#index as HTML
+Redirected to http://www.example.com/admin/users/sign_in
+Filter chain halted as :authenticate_user! rendered or redirected
+Completed 302 Found in 3ms (ActiveRecord: 0.0ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::PUT #update::with valid user: test_0002_anonymous
+----------------------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-10@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-10@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-10@example.com"], ["created_at", 2016-11-16 22:29:54 UTC], ["updated_at", 2016-11-16 22:29:54 UTC], ["confirmation_token", "ytkRVKLZeb7-awx-Arn8"], ["confirmation_sent_at", 2016-11-16 22:29:54 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 2.7ms
-Sent mail to joe-16@example.com (3.5ms)
-Date: Mon, 24 Oct 2016 16:40:54 +0100
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.8ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 37.5ms
+Sent mail to joe-10@example.com (3.5ms)
+Date: Wed, 16 Nov 2016 22:29:54 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-16@example.com
-Message-ID: <580e2b86d47f4_1031a3fd81583f9c855368@Aarons-iMac.local.mail>
+To: joe-10@example.com
+Message-ID: <582cdde2d75ab_32783fe28d43f9b886866@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b86d4372_1031a3fd81583f9c855236";
+ boundary="--==_mimepart_582cdde2d7115_32783fe28d43f9b8867b2";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b86d4372_1031a3fd81583f9c855236
+----==_mimepart_582cdde2d7115_32783fe28d43f9b8867b2
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -1699,11 +1429,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=k5K-zeQYbxjgBB1v2FQz )
+( http://localhost:3000/admin/users/confirmation.444896d5-73c2-4e8d-b51c-f2b6a20d2ac2?confirmation_token=ytkRVKLZeb7-awx-Arn8 )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b86d4372_1031a3fd81583f9c855236
+----==_mimepart_582cdde2d7115_32783fe28d43f9b8867b2
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1736,7 +1466,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -1749,7 +1479,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=k5K-zeQYbxjgBB1v2FQz" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.444896d5-73c2-4e8d-b51c-f2b6a20d2ac2?confirmation_token=ytkRVKLZeb7-awx-Arn8" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -1794,57 +1524,57 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b86d4372_1031a3fd81583f9c855236--
+----==_mimepart_582cdde2d7115_32783fe28d43f9b8867b2--
 
-Processing by PushType::ConfirmationsController#show as HTML
-  Parameters: {"confirmation_token"=>"k5K-zeQYbxjgBB1v2FQz"}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "k5K-zeQYbxjgBB1v2FQz"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.3ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (1.7ms)
-Completed 200 OK in 7ms (Views: 6.2ms | ActiveRecord: 0.2ms)
+Processing by PushType::ConfirmationsController#update as HTML
+  Parameters: {"user"=>{"confirmation_token"=>"ytkRVKLZeb7-awx-Arn8", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "ytkRVKLZeb7-awx-Arn8"], ["LIMIT", 1]]
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-10@example.com"], ["id", "444896d5-73c2-4e8d-b51c-f2b6a20d2ac2"], ["LIMIT", 1]]
+   (0.1ms)  SAVEPOINT active_record_2
+  SQL (0.2ms)  UPDATE "push_type_users" SET "encrypted_password" = $1, "confirmed_at" = $2, "updated_at" = $3 WHERE "push_type_users"."id" = $4  [["encrypted_password", "$2a$04$T3L1BVLS13Atoc4DLUaQnOYMKq3lymSqzuB9k8/5a7ywUSRsFsdTC"], ["confirmed_at", 2016-11-16 22:29:54 UTC], ["updated_at", 2016-11-16 22:29:54 UTC], ["id", "444896d5-73c2-4e8d-b51c-f2b6a20d2ac2"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+   (0.1ms)  SAVEPOINT active_record_2
+  SQL (0.2ms)  UPDATE "push_type_users" SET "updated_at" = $1, "sign_in_count" = $2, "current_sign_in_at" = $3, "last_sign_in_at" = $4, "current_sign_in_ip" = $5, "last_sign_in_ip" = $6 WHERE "push_type_users"."id" = $7  [["updated_at", 2016-11-16 22:29:54 UTC], ["sign_in_count", 1], ["current_sign_in_at", 2016-11-16 22:29:54 UTC], ["last_sign_in_at", 2016-11-16 22:29:54 UTC], ["current_sign_in_ip", "0.0.0.0"], ["last_sign_in_ip", "0.0.0.0"], ["id", "444896d5-73c2-4e8d-b51c-f2b6a20d2ac2"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Redirected to http://test.host/
+Completed 302 Found in 18ms (ActiveRecord: 1.3ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
----------------------------------------------------------------
-PushType::UsersControllerTest::PUT #invite: test_0001_anonymous
----------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
+----------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::PUT #update::with valid user: test_0001_anonymous
+----------------------------------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-17@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-17@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-17@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-10-24 15:40:54 UTC], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-18@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-18@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-18@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "T4QBMHNvTncvMxsN3cGw"], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-11@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-11@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-11@example.com"], ["created_at", 2016-11-16 22:29:54 UTC], ["updated_at", 2016-11-16 22:29:54 UTC], ["confirmation_token", "X_9p8BEbM_JcepnardtC"], ["confirmation_sent_at", 2016-11-16 22:29:54 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
   Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
 Devise::Mailer#confirmation_instructions: processed outbound mail in 2.8ms
-Sent mail to joe-18@example.com (4.0ms)
-Date: Mon, 24 Oct 2016 16:40:54 +0100
+Sent mail to joe-11@example.com (4.1ms)
+Date: Wed, 16 Nov 2016 22:29:54 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-18@example.com
-Message-ID: <580e2b86e1ef4_1031a3fd81583f9c855654@Aarons-iMac.local.mail>
+To: joe-11@example.com
+Message-ID: <582cdde2e5b99_32783fe28d43f9b8871b9@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b86e19b9_1031a3fd81583f9c85552b";
+ boundary="--==_mimepart_582cdde2e5671_32783fe28d43f9b887079";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b86e19b9_1031a3fd81583f9c85552b
+----==_mimepart_582cdde2e5671_32783fe28d43f9b887079
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -1855,11 +1585,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=T4QBMHNvTncvMxsN3cGw )
+( http://localhost:3000/admin/users/confirmation.7f8a92cd-8152-4cc7-9f31-593f3b8b1c9c?confirmation_token=X_9p8BEbM_JcepnardtC )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b86e19b9_1031a3fd81583f9c85552b
+----==_mimepart_582cdde2e5671_32783fe28d43f9b887079
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1892,7 +1622,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -1905,7 +1635,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=T4QBMHNvTncvMxsN3cGw" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.7f8a92cd-8152-4cc7-9f31-593f3b8b1c9c?confirmation_token=X_9p8BEbM_JcepnardtC" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -1950,37 +1680,90 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b86e19b9_1031a3fd81583f9c85552b--
+----==_mimepart_582cdde2e5671_32783fe28d43f9b887079--
 
-Processing by PushType::UsersController#invite as HTML
-  Parameters: {"id"=>"ff539ec5-bc3b-4331-b3cc-d2ad642ba02d"}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "2c11920f-e649-4ceb-b360-899b92d4c613"], ["LIMIT", 1]]
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "ff539ec5-bc3b-4331-b3cc-d2ad642ba02d"], ["LIMIT", 1]]
+Processing by PushType::ConfirmationsController#update as HTML
+  Parameters: {"user"=>{"confirmation_token"=>"X_9p8BEbM_JcepnardtC", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "X_9p8BEbM_JcepnardtC"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-11@example.com"], ["id", "7f8a92cd-8152-4cc7-9f31-593f3b8b1c9c"], ["LIMIT", 1]]
    (0.1ms)  SAVEPOINT active_record_2
+  SQL (0.2ms)  UPDATE "push_type_users" SET "encrypted_password" = $1, "confirmed_at" = $2, "updated_at" = $3 WHERE "push_type_users"."id" = $4  [["encrypted_password", "$2a$04$Wyw.UAqseQ1EV2ta15.Q6ONxs1AevgBJtVW751CzYaSHyHkIoQmfC"], ["confirmed_at", 2016-11-16 22:29:54 UTC], ["updated_at", 2016-11-16 22:29:54 UTC], ["id", "7f8a92cd-8152-4cc7-9f31-593f3b8b1c9c"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+   (0.1ms)  SAVEPOINT active_record_2
+  SQL (0.2ms)  UPDATE "push_type_users" SET "updated_at" = $1, "sign_in_count" = $2, "current_sign_in_at" = $3, "last_sign_in_at" = $4, "current_sign_in_ip" = $5, "last_sign_in_ip" = $6 WHERE "push_type_users"."id" = $7  [["updated_at", 2016-11-16 22:29:54 UTC], ["sign_in_count", 1], ["current_sign_in_at", 2016-11-16 22:29:54 UTC], ["last_sign_in_at", 2016-11-16 22:29:54 UTC], ["current_sign_in_ip", "0.0.0.0"], ["last_sign_in_ip", "0.0.0.0"], ["id", "7f8a92cd-8152-4cc7-9f31-593f3b8b1c9c"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Redirected to http://test.host/
+Completed 302 Found in 7ms (ActiveRecord: 1.1ms)
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 LIMIT $2  [["id", "7f8a92cd-8152-4cc7-9f31-593f3b8b1c9c"], ["LIMIT", 1]]
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+-----------------------------------------------------------------------
+AuthenticatedControllerTest::authenticated request: test_0001_anonymous
+-----------------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-12@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-12@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "encrypted_password", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-12@example.com"], ["created_at", 2016-11-16 22:29:54 UTC], ["updated_at", 2016-11-16 22:29:54 UTC], ["encrypted_password", "$2a$04$cNyBHhPxCH3rLvTB1sJP7.Z15Qb0KzCjMYVX5w/hxVMS3EQHd28D6"], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-11-16 22:29:54 UTC], ["confirmation_sent_at", 2016-11-16 22:29:54 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Started POST "/admin/users/sign_in" for 127.0.0.1 at 2016-11-16 22:29:54 +0000
+Processing by PushType::SessionsController#create as HTML
+  Parameters: {"user"=>{"email"=>"joe-12@example.com", "password"=>"[FILTERED]"}}
+  PushType::User Load (0.4ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."email" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["email", "joe-12@example.com"], ["LIMIT", 1]]
+   (0.1ms)  SAVEPOINT active_record_2
+  SQL (0.3ms)  UPDATE "push_type_users" SET "current_sign_in_at" = $1, "last_sign_in_at" = $2, "current_sign_in_ip" = $3, "last_sign_in_ip" = $4, "sign_in_count" = $5, "updated_at" = $6 WHERE "push_type_users"."id" = $7  [["current_sign_in_at", 2016-11-16 22:29:54 UTC], ["last_sign_in_at", 2016-11-16 22:29:54 UTC], ["current_sign_in_ip", "127.0.0.1"], ["last_sign_in_ip", "127.0.0.1"], ["sign_in_count", 1], ["updated_at", 2016-11-16 22:29:54 UTC], ["id", "f2681aff-fbaa-457c-881a-ea43a2533390"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Redirected to http://www.example.com/
+Completed 302 Found in 46ms (ActiveRecord: 0.8ms)
+Started GET "/admin/nodes" for 127.0.0.1 at 2016-11-16 22:29:55 +0000
+Processing by PushType::Admin::NodesController#index as HTML
+  PushType::User Load (0.4ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "f2681aff-fbaa-457c-881a-ea43a2533390"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/admin/app/views/push_type/admin/nodes/index.html.haml within layouts/push_type/admin
+   (0.3ms)  SELECT COUNT(count_column) FROM (SELECT  1 AS count_column FROM "push_type_nodes" WHERE "push_type_nodes"."parent_id" IS NULL AND "push_type_nodes"."deleted_at" IS NULL LIMIT $1 OFFSET $2) subquery_for_count  [["LIMIT", 30], ["OFFSET", 0]]
+   (0.2ms)  SELECT COUNT(*) FROM "push_type_nodes" WHERE "push_type_nodes"."parent_id" IS NULL AND "push_type_nodes"."deleted_at" IS NULL
+  Rendered /Users/aaron/dev/pushcode/push_type/admin/app/views/push_type/admin/nodes/_new_node_button.html.haml (2.1ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/admin/app/views/push_type/admin/nodes/index.html.haml within layouts/push_type/admin (21.6ms)
+Completed 200 OK in 2046ms (Views: 33.0ms | ActiveRecord: 0.9ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------------------------------------------------------------
+PushType::AuthenticatableTest::#password_required?::with existing user and clean password: test_0001_anonymous
+--------------------------------------------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-13@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-13@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-13@example.com"], ["created_at", 2016-11-16 22:29:57 UTC], ["updated_at", 2016-11-16 22:29:57 UTC], ["confirmation_token", "wy2ds-yTA5i8BSSsqt2a"], ["confirmation_sent_at", 2016-11-16 22:29:57 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 3.1ms
-Sent mail to joe-18@example.com (3.6ms)
-Date: Mon, 24 Oct 2016 16:40:54 +0100
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.8ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 38.1ms
+Sent mail to joe-13@example.com (4.1ms)
+Date: Wed, 16 Nov 2016 22:29:57 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-18@example.com
-Message-ID: <580e2b86ec3d8_1031a3fd81583f9c8559e9@Aarons-iMac.local.mail>
+To: joe-13@example.com
+Message-ID: <582cdde520ec4_32783fe28d43f9b8874e6@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b86ebf4b_1031a3fd81583f9c8558df";
+ boundary="--==_mimepart_582cdde520a16_32783fe28d43f9b887328";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b86ebf4b_1031a3fd81583f9c8558df
+----==_mimepart_582cdde520a16_32783fe28d43f9b887328
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -1991,11 +1774,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=T4QBMHNvTncvMxsN3cGw )
+( http://localhost:3000/admin/users/confirmation.24988e74-f41a-4215-a62b-033c8172aae5?confirmation_token=wy2ds-yTA5i8BSSsqt2a )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b86ebf4b_1031a3fd81583f9c8558df
+----==_mimepart_582cdde520a16_32783fe28d43f9b887328
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2028,7 +1811,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -2041,7 +1824,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=T4QBMHNvTncvMxsN3cGw" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.24988e74-f41a-4215-a62b-033c8172aae5?confirmation_token=wy2ds-yTA5i8BSSsqt2a" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -2086,52 +1869,324 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b86ebf4b_1031a3fd81583f9c8558df--
+----==_mimepart_582cdde520a16_32783fe28d43f9b887328--
 
-Redirected to http://test.host/push_type/users
-Completed 302 Found in 40ms (ActiveRecord: 0.5ms)
-   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.2ms)  ROLLBACK
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
----------------------------------------------------------------
-PushType::UsersControllerTest::PUT #invite: test_0002_anonymous
----------------------------------------------------------------
+--------------------------------------------------------------------------------------------
+PushType::Admin::ProfilesControllerTest::PUT #update::with invalid user: test_0002_anonymous
+--------------------------------------------------------------------------------------------
    (0.1ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-19@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-19@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-19@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-10-24 15:40:54 UTC], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-14@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-14@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-14@example.com"], ["created_at", 2016-11-16 22:29:57 UTC], ["updated_at", 2016-11-16 22:29:57 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-11-16 22:29:57 UTC], ["confirmation_sent_at", 2016-11-16 22:29:57 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::Admin::ProfilesController#update as HTML
+  Parameters: {"user"=>{"name"=>""}}
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "ad3c72ff-14ed-4648-abff-25251aad5417"], ["LIMIT", 1]]
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-20@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-20@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-20@example.com"], ["created_at", 2016-10-24 15:40:54 UTC], ["updated_at", 2016-10-24 15:40:54 UTC], ["confirmation_token", "vUPwA451GiPw7wxC2muL"], ["confirmation_sent_at", 2016-10-24 15:40:54 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-14@example.com"], ["id", "ad3c72ff-14ed-4648-abff-25251aad5417"], ["LIMIT", 1]]
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_2
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin (6.3ms)
+Completed 200 OK in 19ms (Views: 15.1ms | ActiveRecord: 0.5ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------------------------------------------
+PushType::Admin::ProfilesControllerTest::PUT #update::with invalid user: test_0001_anonymous
+--------------------------------------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-15@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-15@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-15@example.com"], ["created_at", 2016-11-16 22:29:57 UTC], ["updated_at", 2016-11-16 22:29:57 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-11-16 22:29:57 UTC], ["confirmation_sent_at", 2016-11-16 22:29:57 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 2.9ms
-Sent mail to joe-20@example.com (3.5ms)
-Date: Mon, 24 Oct 2016 16:40:55 +0100
-From: pushtype@example.com
-Reply-To: pushtype@example.com
-To: joe-20@example.com
-Message-ID: <580e2b8731e3_1031a3fd81583f9c856294@Aarons-iMac.local.mail>
-Subject: [PushType] Confirm your account
-Mime-Version: 1.0
-Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b872d94_1031a3fd81583f9c8561a1";
- charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
+Processing by PushType::Admin::ProfilesController#update as HTML
+  Parameters: {"user"=>{"name"=>""}}
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "957dcc71-a9c2-4f92-ae1f-728bf9aed245"], ["LIMIT", 1]]
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-15@example.com"], ["id", "957dcc71-a9c2-4f92-ae1f-728bf9aed245"], ["LIMIT", 1]]
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_2
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin (1.9ms)
+Completed 200 OK in 11ms (Views: 7.8ms | ActiveRecord: 0.5ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+PushType::AuthenticatableTest::recoverable: test_0001_anonymous
+---------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------------------------------------------
+AuthenticatedApiControllerTest::authenticated with authorization header: test_0001_anonymous
+--------------------------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-16@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-16@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-16@example.com"], ["created_at", 2016-11-16 22:29:57 UTC], ["updated_at", 2016-11-16 22:29:57 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-11-16 22:29:57 UTC], ["confirmation_sent_at", 2016-11-16 22:29:57 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Started GET "/api/nodes" for 127.0.0.1 at 2016-11-16 22:29:57 +0000
+Processing by PushType::Api::NodesController#index as JSON
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "3fc03ddf-5a51-45bb-a371-5668500e5fe7"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/nodes/index.json.jbuilder
+  PushType::Node Load (0.3ms)  SELECT  "push_type_nodes".* FROM "push_type_nodes" WHERE "push_type_nodes"."parent_id" IS NULL AND "push_type_nodes"."deleted_at" IS NULL ORDER BY sort_order LIMIT $1 OFFSET $2  [["LIMIT", 30], ["OFFSET", 0]]
+  Rendered collection of /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/shared/_pagination.json.jbuilder [0 times] (0.0ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/nodes/index.json.jbuilder (3.9ms)
+Completed 200 OK in 42ms (Views: 32.6ms | ActiveRecord: 0.5ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+--------------------------------------------------------------------------------------
+PushType::AuthenticatableTest::#password_required?::with new user: test_0001_anonymous
+--------------------------------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+-------------------------------------------------------------
+PushType::AuthenticatableTest::trackable: test_0001_anonymous
+-------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------------------------------------------------------
+PushType::Admin::ProfilesControllerTest::PUT #update::with valid user: test_0001_anonymous
+------------------------------------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-17@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-17@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-17@example.com"], ["created_at", 2016-11-16 22:29:57 UTC], ["updated_at", 2016-11-16 22:29:57 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-11-16 22:29:57 UTC], ["confirmation_sent_at", 2016-11-16 22:29:57 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::Admin::ProfilesController#update as HTML
+  Parameters: {"user"=>{"name"=>"Test user ABC"}}
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "cf8cf4ce-cb4d-47e1-b508-4610e6e8e00d"], ["LIMIT", 1]]
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-17@example.com"], ["id", "cf8cf4ce-cb4d-47e1-b508-4610e6e8e00d"], ["LIMIT", 1]]
+  SQL (0.2ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", 2016-11-16 22:29:57 UTC], ["id", "cf8cf4ce-cb4d-47e1-b508-4610e6e8e00d"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Redirected to http://test.host/admin/profile/edit
+Completed 302 Found in 5ms (ActiveRecord: 0.6ms)
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 LIMIT $2  [["id", "cf8cf4ce-cb4d-47e1-b508-4610e6e8e00d"], ["LIMIT", 1]]
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------------------------------------------------------
+PushType::Admin::ProfilesControllerTest::PUT #update::with valid user: test_0002_anonymous
+------------------------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-18@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-18@example.com"], ["LIMIT", 1]]
+  SQL (0.5ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-18@example.com"], ["created_at", 2016-11-16 22:29:57 UTC], ["updated_at", 2016-11-16 22:29:57 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-11-16 22:29:57 UTC], ["confirmation_sent_at", 2016-11-16 22:29:57 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::Admin::ProfilesController#update as HTML
+  Parameters: {"user"=>{"name"=>"Test user ABC"}}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "04bf6990-3b29-44cf-a1d7-20ec01437077"], ["LIMIT", 1]]
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-18@example.com"], ["id", "04bf6990-3b29-44cf-a1d7-20ec01437077"], ["LIMIT", 1]]
+  SQL (0.2ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", 2016-11-16 22:29:57 UTC], ["id", "04bf6990-3b29-44cf-a1d7-20ec01437077"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Redirected to http://test.host/admin/profile/edit
+Completed 302 Found in 6ms (ActiveRecord: 0.9ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------------------------------------------------------
+PushType::Admin::ProfilesControllerTest::PUT #update::with valid user: test_0003_anonymous
+------------------------------------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-19@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-19@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-19@example.com"], ["created_at", 2016-11-16 22:29:57 UTC], ["updated_at", 2016-11-16 22:29:57 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-11-16 22:29:57 UTC], ["confirmation_sent_at", 2016-11-16 22:29:57 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::Admin::ProfilesController#update as HTML
+  Parameters: {"user"=>{"name"=>"Test user ABC"}}
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "0e671fe1-8090-452d-a47a-de3ae1f5193a"], ["LIMIT", 1]]
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-19@example.com"], ["id", "0e671fe1-8090-452d-a47a-de3ae1f5193a"], ["LIMIT", 1]]
+  SQL (0.2ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", 2016-11-16 22:29:57 UTC], ["id", "0e671fe1-8090-452d-a47a-de3ae1f5193a"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Redirected to http://test.host/admin/profile/edit
+Completed 302 Found in 5ms (ActiveRecord: 0.8ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+----------------------------------------------------------------
+PushType::AuthenticatableTest::rememberable: test_0001_anonymous
+----------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+--------------------------------------------------------
+PushType::AuthenticationMethodsTest: test_0002_anonymous
+--------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------
+PushType::AuthenticationMethodsTest: test_0001_anonymous
+--------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::GET #show::with invalid confirmation token: test_0001_anonymous
+------------------------------------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+Processing by PushType::ConfirmationsController#show as HTML
+  Parameters: {"confirmation_token"=>"invalid"}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "561b066fe811f6c3537de4c5e4d21384bd937bf1ffc6fdbf2ea5736bff880ee0"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (1.0ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth (6.4ms)
+Completed 200 OK in 191ms (Views: 16.7ms | ActiveRecord: 0.5ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::GET #show::with invalid confirmation token: test_0002_anonymous
+------------------------------------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+Processing by PushType::ConfirmationsController#show as HTML
+  Parameters: {"confirmation_token"=>"invalid"}
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "561b066fe811f6c3537de4c5e4d21384bd937bf1ffc6fdbf2ea5736bff880ee0"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.3ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth (1.4ms)
+Completed 200 OK in 8ms (Views: 5.3ms | ActiveRecord: 0.3ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------------
+PushType::Admin::ProfilesControllerTest::GET #edit: test_0002_anonymous
+-----------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-20@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-20@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-20@example.com"], ["created_at", 2016-11-16 22:29:57 UTC], ["updated_at", 2016-11-16 22:29:57 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-11-16 22:29:57 UTC], ["confirmation_sent_at", 2016-11-16 22:29:57 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::Admin::ProfilesController#edit as HTML
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "4e10ac0b-66b6-4b45-900e-1a1ec5831452"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin (6.5ms)
+Completed 200 OK in 24ms (Views: 18.5ms | ActiveRecord: 0.2ms)
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------------
+PushType::Admin::ProfilesControllerTest::GET #edit: test_0001_anonymous
+-----------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-21@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-21@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-21@example.com"], ["created_at", 2016-11-16 22:29:57 UTC], ["updated_at", 2016-11-16 22:29:57 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-11-16 22:29:57 UTC], ["confirmation_sent_at", 2016-11-16 22:29:57 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::Admin::ProfilesController#edit as HTML
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "7b187707-1c9e-4b72-8f68-ac1152f19d92"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin (1.9ms)
+Completed 200 OK in 10ms (Views: 8.4ms | ActiveRecord: 0.1ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------------------------------
+AuthenticatedApiControllerTest::unauthenticated request: test_0001_anonymous
+----------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+Started GET "/api/nodes" for 127.0.0.1 at 2016-11-16 22:29:57 +0000
+Processing by PushType::Api::NodesController#index as JSON
+Filter chain halted as :authenticate_user! rendered or redirected
+Completed 401 Unauthorized in 1ms (ActiveRecord: 0.0ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0002_anonymous
+------------------------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-22@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-22@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-22@example.com"], ["created_at", 2016-11-16 22:29:57 UTC], ["updated_at", 2016-11-16 22:29:57 UTC], ["confirmation_token", "_SZVaVemG6WZ7QDshM_C"], ["confirmation_sent_at", 2016-11-16 22:29:57 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.9ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 41.0ms
+Sent mail to joe-22@example.com (4.2ms)
+Date: Wed, 16 Nov 2016 22:29:57 +0000
+From: pushtype@example.com
+Reply-To: pushtype@example.com
+To: joe-22@example.com
+Message-ID: <582cdde5975d8_32783fe28d43f9b8877e6@Aarons-iMac.local.mail>
+Subject: [PushType] Confirm your account
+Mime-Version: 1.0
+Content-Type: multipart/alternative;
+ boundary="--==_mimepart_582cdde596fdf_32783fe28d43f9b887668";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
 
-----==_mimepart_580e2b872d94_1031a3fd81583f9c8561a1
+
+----==_mimepart_582cdde596fdf_32783fe28d43f9b887668
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -2142,11 +2197,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=vUPwA451GiPw7wxC2muL )
+( http://localhost:3000/admin/users/confirmation.d2c842ad-19ee-494c-bfcb-bb8af612a3fd?confirmation_token=_SZVaVemG6WZ7QDshM_C )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b872d94_1031a3fd81583f9c8561a1
+----==_mimepart_582cdde596fdf_32783fe28d43f9b887668
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2179,7 +2234,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -2192,7 +2247,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=vUPwA451GiPw7wxC2muL" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.d2c842ad-19ee-494c-bfcb-bb8af612a3fd?confirmation_token=_SZVaVemG6WZ7QDshM_C" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -2237,37 +2292,53 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b872d94_1031a3fd81583f9c8561a1--
+----==_mimepart_582cdde596fdf_32783fe28d43f9b887668--
 
-Processing by PushType::UsersController#invite as HTML
-  Parameters: {"id"=>"3f760966-7808-49d2-abec-19be4386d041"}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "b676644c-7db3-440f-8cf0-f0500c4325ed"], ["LIMIT", 1]]
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "3f760966-7808-49d2-abec-19be4386d041"], ["LIMIT", 1]]
+Processing by PushType::ConfirmationsController#update as HTML
+  Parameters: {"user"=>{"confirmation_token"=>"_SZVaVemG6WZ7QDshM_C", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "_SZVaVemG6WZ7QDshM_C"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-22@example.com"], ["id", "d2c842ad-19ee-494c-bfcb-bb8af612a3fd"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (1.2ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (7.7ms)
+Completed 200 OK in 21ms (Views: 18.2ms | ActiveRecord: 0.4ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0001_anonymous
+------------------------------------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-23@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-23@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-23@example.com"], ["created_at", 2016-11-16 22:29:57 UTC], ["updated_at", 2016-11-16 22:29:57 UTC], ["confirmation_token", "W75Fr-PVwxR3SqCjh_aq"], ["confirmation_sent_at", 2016-11-16 22:29:57 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.2ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 2.6ms
-Sent mail to joe-20@example.com (3.6ms)
-Date: Mon, 24 Oct 2016 16:40:55 +0100
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.6ms
+Sent mail to joe-23@example.com (3.8ms)
+Date: Wed, 16 Nov 2016 22:29:57 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-20@example.com
-Message-ID: <580e2b87d7f1_1031a3fd81583f9c8565bc@Aarons-iMac.local.mail>
+To: joe-23@example.com
+Message-ID: <582cdde5a7a96_32783fe28d43f9b8880e@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b87d378_1031a3fd81583f9c85647f";
+ boundary="--==_mimepart_582cdde5a7577_32783fe28d43f9b887932";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b87d378_1031a3fd81583f9c85647f
+----==_mimepart_582cdde5a7577_32783fe28d43f9b887932
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -2278,11 +2349,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=vUPwA451GiPw7wxC2muL )
+( http://localhost:3000/admin/users/confirmation.d4fe1bea-1d5a-4add-9f57-bca9bdcc8201?confirmation_token=W75Fr-PVwxR3SqCjh_aq )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b87d378_1031a3fd81583f9c85647f
+----==_mimepart_582cdde5a7577_32783fe28d43f9b887932
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2315,7 +2386,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -2328,7 +2399,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=vUPwA451GiPw7wxC2muL" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.d4fe1bea-1d5a-4add-9f57-bca9bdcc8201?confirmation_token=W75Fr-PVwxR3SqCjh_aq" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -2373,52 +2444,53 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b87d378_1031a3fd81583f9c85647f--
+----==_mimepart_582cdde5a7577_32783fe28d43f9b887932--
 
-Redirected to http://test.host/push_type/users
-Completed 302 Found in 42ms (ActiveRecord: 0.5ms)
+Processing by PushType::ConfirmationsController#update as HTML
+  Parameters: {"user"=>{"confirmation_token"=>"W75Fr-PVwxR3SqCjh_aq", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "W75Fr-PVwxR3SqCjh_aq"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-23@example.com"], ["id", "d4fe1bea-1d5a-4add-9f57-bca9bdcc8201"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.3ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (1.7ms)
+Completed 200 OK in 8ms (Views: 5.3ms | ActiveRecord: 0.4ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
----------------------------------------------------------------
-PushType::UsersControllerTest::PUT #invite: test_0003_anonymous
----------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
+------------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0003_anonymous
+------------------------------------------------------------------------------------------
    (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-21@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-21@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-21@example.com"], ["created_at", 2016-10-24 15:40:55 UTC], ["updated_at", 2016-10-24 15:40:55 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2016-10-24 15:40:55 UTC], ["confirmation_sent_at", 2016-10-24 15:40:55 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-22@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-22@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-22@example.com"], ["created_at", 2016-10-24 15:40:55 UTC], ["updated_at", 2016-10-24 15:40:55 UTC], ["confirmation_token", "gtvptNekq3oss45brQcG"], ["confirmation_sent_at", 2016-10-24 15:40:55 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-24@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-24@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-24@example.com"], ["created_at", 2016-11-16 22:29:57 UTC], ["updated_at", 2016-11-16 22:29:57 UTC], ["confirmation_token", "KfkxdWyzH1CocTUtsypS"], ["confirmation_sent_at", 2016-11-16 22:29:57 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 2.8ms
-Sent mail to joe-22@example.com (3.7ms)
-Date: Mon, 24 Oct 2016 16:40:55 +0100
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.4ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.1ms
+Sent mail to joe-24@example.com (3.6ms)
+Date: Wed, 16 Nov 2016 22:29:57 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-22@example.com
-Message-ID: <580e2b8719271_1031a3fd81583f9c85688e@Aarons-iMac.local.mail>
+To: joe-24@example.com
+Message-ID: <582cdde5b6aea_32783fe28d43f9b888353@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b8718dbf_1031a3fd81583f9c8567e8";
+ boundary="--==_mimepart_582cdde5b66b1_32783fe28d43f9b88821b";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b8718dbf_1031a3fd81583f9c8567e8
+----==_mimepart_582cdde5b66b1_32783fe28d43f9b88821b
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -2429,11 +2501,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=gtvptNekq3oss45brQcG )
+( http://localhost:3000/admin/users/confirmation.214b8691-1583-470e-8503-abeb6589f446?confirmation_token=KfkxdWyzH1CocTUtsypS )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b8718dbf_1031a3fd81583f9c8567e8
+----==_mimepart_582cdde5b66b1_32783fe28d43f9b88821b
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2466,7 +2538,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -2479,7 +2551,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=gtvptNekq3oss45brQcG" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.214b8691-1583-470e-8503-abeb6589f446?confirmation_token=KfkxdWyzH1CocTUtsypS" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -2524,37 +2596,89 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b8718dbf_1031a3fd81583f9c8567e8--
+----==_mimepart_582cdde5b66b1_32783fe28d43f9b88821b--
 
-Processing by PushType::UsersController#invite as HTML
-  Parameters: {"id"=>"97bd2f41-a24c-492a-a258-ccb8cefa4c97"}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "1e664b2e-77fc-427a-9f1e-e93860f6b031"], ["LIMIT", 1]]
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "97bd2f41-a24c-492a-a258-ccb8cefa4c97"], ["LIMIT", 1]]
+Processing by PushType::ConfirmationsController#update as HTML
+  Parameters: {"user"=>{"confirmation_token"=>"KfkxdWyzH1CocTUtsypS", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "KfkxdWyzH1CocTUtsypS"], ["LIMIT", 1]]
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-24@example.com"], ["id", "214b8691-1583-470e-8503-abeb6589f446"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.3ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (2.1ms)
+Completed 200 OK in 10ms (Views: 6.6ms | ActiveRecord: 0.5ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+---------------------------------------------------------------------------
+PushType::AuthenticatableTest::database_athenticatable: test_0001_anonymous
+---------------------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------------------
+PushType::AuthenticatableTest::database_athenticatable: test_0002_anonymous
+---------------------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+PushType::AuthenticatableTest::validatable: test_0001_anonymous
+---------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+PushType::AuthenticatableTest::validatable: test_0002_anonymous
+---------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------------------------------------------------------------
+PushType::AuthenticatableTest::#password_required?::with existing user and dirty password: test_0001_anonymous
+--------------------------------------------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-25@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-25@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-25@example.com"], ["created_at", 2016-11-16 22:29:57 UTC], ["updated_at", 2016-11-16 22:29:57 UTC], ["confirmation_token", "xMr5yQjKgzEbWdPXPYjn"], ["confirmation_sent_at", 2016-11-16 22:29:57 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 2.7ms
-Sent mail to joe-22@example.com (3.7ms)
-Date: Mon, 24 Oct 2016 16:40:55 +0100
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.4ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.2ms
+Sent mail to joe-25@example.com (3.6ms)
+Date: Wed, 16 Nov 2016 22:29:57 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-22@example.com
-Message-ID: <580e2b8723502_1031a3fd81583f9c85713e@Aarons-iMac.local.mail>
+To: joe-25@example.com
+Message-ID: <582cdde5c67e6_32783fe28d43f9b88863d@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_580e2b872307e_1031a3fd81583f9c85706f";
+ boundary="--==_mimepart_582cdde5c6363_32783fe28d43f9b88857c";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_580e2b872307e_1031a3fd81583f9c85706f
+----==_mimepart_582cdde5c6363_32783fe28d43f9b88857c
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
-PushType ( http://localhost:3000/push_type/ )
+PushType ( http://localhost:3000/admin/ )
 
 Hello Joe Bloggs
 
@@ -2565,11 +2689,11 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/push_type/confirmation?confirmation_token=gtvptNekq3oss45brQcG )
+( http://localhost:3000/admin/users/confirmation.0846dc4d-7c77-43d3-a744-80171777c0fe?confirmation_token=xMr5yQjKgzEbWdPXPYjn )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_580e2b872307e_1031a3fd81583f9c85706f
+----==_mimepart_582cdde5c6363_32783fe28d43f9b88857c
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2602,7 +2726,7 @@ body {
       <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
       <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/push_type/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
         </tr>
         <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
           <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
@@ -2615,7 +2739,7 @@ body {
 <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
   <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
     <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/push_type/confirmation?confirmation_token=gtvptNekq3oss45brQcG" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/users/confirmation.0846dc4d-7c77-43d3-a744-80171777c0fe?confirmation_token=xMr5yQjKgzEbWdPXPYjn" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -2660,9 +2784,25 @@ body {
 </body>
 </html>
 
-----==_mimepart_580e2b872307e_1031a3fd81583f9c85706f--
+----==_mimepart_582cdde5c6363_32783fe28d43f9b88857c--
 
-Redirected to http://test.host/push_type/users
-Completed 302 Found in 41ms (ActiveRecord: 0.4ms)
-   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.2ms)  ROLLBACK
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------
+PushType::InvitationMethodsTest: test_0001_anonymous
+----------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+PushType::AuthenticatableTest::confirmable: test_0001_anonymous
+---------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK