push_type_auth 0.6.0.beta.2 → 0.6.0.beta.3

data/test/dummy/log/test.log

@@ -1,74 +1,74 @@
    (2.7ms)  CREATE TABLE "schema_migrations" ("version" character varying NOT NULL) 
-   (1.0ms)  CREATE UNIQUE INDEX  "unique_schema_migrations" ON "schema_migrations"  ("version")
+   (0.8ms)  CREATE UNIQUE INDEX  "unique_schema_migrations" ON "schema_migrations"  ("version")
   ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to CreatePushTypeUsers (20151102165930)
+Migrating to CreatePushTypeUsers (20151102202810)
    (0.1ms)  BEGIN
-  SQL (1.8ms)  CREATE EXTENSION IF NOT EXISTS "uuid-ossp"
-   (2.6ms)  CREATE TABLE "push_type_users" ("id" uuid PRIMARY KEY  DEFAULT uuid_generate_v4(), "name" character varying, "email" character varying, "field_store" jsonb, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102165930"]]
+  SQL (1.9ms)  CREATE EXTENSION IF NOT EXISTS "uuid-ossp"
+   (2.2ms)  CREATE TABLE "push_type_users" ("id" uuid PRIMARY KEY  DEFAULT uuid_generate_v4(), "name" character varying, "email" character varying, "field_store" jsonb, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102202810"]]
    (0.7ms)  COMMIT
-Migrating to CreatePushTypeNodes (20151102165931)
+Migrating to CreatePushTypeNodes (20151102202811)
    (0.1ms)  BEGIN
-   (2.1ms)  CREATE TABLE "push_type_nodes" ("id" uuid PRIMARY KEY  DEFAULT uuid_generate_v4(), "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)  [["version", "20151102165931"]]
+   (2.0ms)  CREATE TABLE "push_type_nodes" ("id" uuid PRIMARY KEY  DEFAULT uuid_generate_v4(), "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.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102202811"]]
    (0.4ms)  COMMIT
-Migrating to CreatePushTypeNodeHierarchies (20151102165932)
+Migrating to CreatePushTypeNodeHierarchies (20151102202812)
    (0.1ms)  BEGIN
    (0.4ms)  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.7ms)  CREATE  INDEX  "node_desc_idx" ON "push_type_node_hierarchies"  ("descendant_id")
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102165932"]]
+   (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.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102202812"]]
    (0.4ms)  COMMIT
-Migrating to CreatePushTypeAssets (20151102165933)
+Migrating to CreatePushTypeAssets (20151102202813)
    (0.1ms)  BEGIN
-   (2.1ms)  CREATE TABLE "push_type_assets" ("id" uuid PRIMARY KEY  DEFAULT uuid_generate_v4(), "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.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102165933"]]
-   (0.4ms)  COMMIT
-Migrating to CreatePushTypeTaxonomies (20151102165934)
+   (2.4ms)  CREATE TABLE "push_type_assets" ("id" uuid PRIMARY KEY  DEFAULT uuid_generate_v4(), "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.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102202813"]]
+   (0.5ms)  COMMIT
+Migrating to CreatePushTypeTaxonomies (20151102202814)
    (0.1ms)  BEGIN
-   (2.2ms)  CREATE TABLE "push_type_taxonomies" ("id" uuid PRIMARY KEY  DEFAULT uuid_generate_v4(), "type" character varying, "title" character varying, "slug" character varying, "parent_id" uuid, "sort_order" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (2.0ms)  CREATE TABLE "push_type_taxonomies" ("id" uuid PRIMARY KEY  DEFAULT uuid_generate_v4(), "type" character varying, "title" character varying, "slug" character varying, "parent_id" uuid, "sort_order" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
    (0.2ms)  ALTER TABLE "push_type_assets" ADD "tags" character varying[]
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102165934"]]
-   (0.4ms)  COMMIT
-Migrating to CreatePushTypeTaxonomyHierarchies (20151102165935)
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102202814"]]
+   (0.5ms)  COMMIT
+Migrating to CreatePushTypeTaxonomyHierarchies (20151102202815)
    (0.1ms)  BEGIN
-   (0.4ms)  CREATE TABLE "push_type_taxonomy_hierarchies" ("ancestor_id" uuid NOT NULL, "descendant_id" uuid NOT NULL, "generations" integer NOT NULL) 
+   (0.5ms)  CREATE TABLE "push_type_taxonomy_hierarchies" ("ancestor_id" uuid NOT NULL, "descendant_id" uuid NOT NULL, "generations" integer NOT NULL) 
    (0.7ms)  CREATE UNIQUE INDEX  "taxonomy_anc_desc_idx" ON "push_type_taxonomy_hierarchies"  ("ancestor_id", "descendant_id", "generations")
-   (1.6ms)  CREATE  INDEX  "taxonomy_desc_idx" ON "push_type_taxonomy_hierarchies"  ("descendant_id")
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102165935"]]
+   (0.5ms)  CREATE  INDEX  "taxonomy_desc_idx" ON "push_type_taxonomy_hierarchies"  ("descendant_id")
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102202815"]]
    (0.4ms)  COMMIT
-Migrating to AddFieldStoreDefaultValues (20151102165936)
+Migrating to AddFieldStoreDefaultValues (20151102202816)
    (0.1ms)  BEGIN
    (0.2ms)  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.2ms)  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_users" ALTER COLUMN "field_store" TYPE jsonb
    (0.1ms)  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.1ms)  ALTER TABLE "push_type_users" ALTER "field_store" SET NOT NULL
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102165936"]]
+   (0.2ms)  ALTER TABLE "push_type_users" ALTER "field_store" SET NOT NULL
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102202816"]]
    (0.5ms)  COMMIT
-Migrating to DeviseExtendPushTypeUsers (20151102165937)
+Migrating to DeviseExtendPushTypeUsers (20151102202817)
    (0.1ms)  BEGIN
-   (2.7ms)  ALTER TABLE "push_type_users" ADD "encrypted_password" character varying DEFAULT '' NOT NULL
+   (2.8ms)  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 "current_sign_in_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.1ms)  ALTER TABLE "push_type_users" ADD "current_sign_in_at" timestamp
    (0.1ms)  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
    (0.1ms)  ALTER TABLE "push_type_users" ADD "last_sign_in_ip" character varying
    (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.5ms)  CREATE UNIQUE INDEX  "index_push_type_users_on_email" ON "push_type_users"  ("email")
+   (0.7ms)  CREATE UNIQUE INDEX  "index_push_type_users_on_email" ON "push_type_users"  ("email")
    (0.6ms)  CREATE UNIQUE INDEX  "index_push_type_users_on_reset_password_token" ON "push_type_users"  ("reset_password_token")
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102165937"]]
-   (1.1ms)  COMMIT
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20151102202817"]]
+   (1.0ms)  COMMIT
   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.9ms)  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
@@ -80,7 +80,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
@@ -104,7 +104,7 @@ WHERE c.contype = 'f'
   AND t3.nspname = ANY (current_schemas(false))
 ORDER BY c.conname
 
-   (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
+   (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
 FROM pg_constraint c
 JOIN pg_class t1 ON c.conrelid = t1.oid
 JOIN pg_class t2 ON c.confrelid = t2.oid
@@ -128,7 +128,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.4ms)  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
@@ -140,190 +140,76 @@ WHERE c.contype = 'f'
   AND t3.nspname = ANY (current_schemas(false))
 ORDER BY c.conname
 
-  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (0.4ms)  ALTER TABLE "schema_migrations" DISABLE TRIGGER ALL;ALTER TABLE "push_type_nodes" DISABLE TRIGGER ALL;ALTER TABLE "push_type_node_hierarchies" DISABLE TRIGGER ALL;ALTER TABLE "push_type_taxonomies" DISABLE TRIGGER ALL;ALTER TABLE "push_type_assets" DISABLE TRIGGER ALL;ALTER TABLE "push_type_taxonomy_hierarchies" DISABLE TRIGGER ALL;ALTER TABLE "push_type_users" DISABLE TRIGGER ALL
-   (1.0ms)            SELECT schemaname || '.' || tablename
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.5ms)  ALTER TABLE "schema_migrations" DISABLE TRIGGER ALL;ALTER TABLE "push_type_nodes" DISABLE TRIGGER ALL;ALTER TABLE "push_type_node_hierarchies" DISABLE TRIGGER ALL;ALTER TABLE "push_type_taxonomies" DISABLE TRIGGER ALL;ALTER TABLE "push_type_assets" DISABLE TRIGGER ALL;ALTER TABLE "push_type_taxonomy_hierarchies" DISABLE TRIGGER ALL;ALTER TABLE "push_type_users" DISABLE TRIGGER ALL
+   (1.1ms)            SELECT schemaname || '.' || tablename
           FROM pg_tables
           WHERE 
             tablename !~ '_prt_' AND 
             tablename <> 'schema_migrations' AND 
             schemaname = ANY (current_schemas(false))
 
-   (1.1ms)  select table_name from information_schema.views where table_schema = 'dummy_test'
-   (11.0ms)  TRUNCATE TABLE "public"."push_type_nodes", "public"."push_type_node_hierarchies", "public"."push_type_taxonomies", "public"."push_type_assets", "public"."push_type_taxonomy_hierarchies", "public"."push_type_users" RESTART IDENTITY CASCADE;
+   (0.9ms)  select table_name from information_schema.views where table_schema = 'dummy_test'
+   (10.3ms)  TRUNCATE TABLE "public"."push_type_nodes", "public"."push_type_node_hierarchies", "public"."push_type_taxonomies", "public"."push_type_assets", "public"."push_type_taxonomy_hierarchies", "public"."push_type_users" RESTART IDENTITY CASCADE;
    (0.3ms)  ALTER TABLE "schema_migrations" ENABLE TRIGGER ALL;ALTER TABLE "push_type_nodes" ENABLE TRIGGER ALL;ALTER TABLE "push_type_taxonomies" ENABLE TRIGGER ALL;ALTER TABLE "push_type_assets" ENABLE TRIGGER ALL;ALTER TABLE "push_type_users" ENABLE TRIGGER ALL;ALTER TABLE "push_type_node_hierarchies" ENABLE TRIGGER ALL;ALTER TABLE "push_type_taxonomy_hierarchies" ENABLE TRIGGER ALL
    (0.1ms)  BEGIN
---------------------------------------------------------
-PushType::AuthenticationMethodsTest: test_0001_anonymous
---------------------------------------------------------
+--------------------------------------------------------------------------------------
+PushType::AuthenticatableTest::#password_required?::with new user: 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
+   (0.0ms)  BEGIN
 --------------------------------------------------------
 PushType::AuthenticationMethodsTest: test_0002_anonymous
 --------------------------------------------------------
-   (0.1ms)  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.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.0ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.0ms)  ROLLBACK
-   (0.0ms)  BEGIN
------------------------------------------------------------------------------------
-PushType::ProfilesControllerTest::PUT #update::with valid user: test_0003_anonymous
------------------------------------------------------------------------------------
+   (0.1ms)  BEGIN
+--------------------------------------------------------
+PushType::AuthenticationMethodsTest: 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.4ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-1@example.com' LIMIT 1
-  SQL (0.7ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-1@example.com"], ["confirmation_sent_at", "2015-11-02 16:59:35.973181"], ["confirmed_at", "2015-11-02 16:59:35.973257"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 16:59:35.983762"], ["updated_at", "2015-11-02 16:59:35.983762"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::ProfilesController#update as HTML
-  Parameters: {"user"=>{"name"=>"Test user ABC"}}
-  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 1  [["id", "a3bfb415-b5cc-4845-8ab5-b570c6a9ba5d"]]
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-1@example.com' AND "push_type_users"."id" != 'a3bfb415-b5cc-4845-8ab5-b570c6a9ba5d') 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", "2015-11-02 16:59:36.004467"], ["id", "a3bfb415-b5cc-4845-8ab5-b570c6a9ba5d"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Redirected to http://test.host/push_type/profile/edit
-Completed 302 Found in 16ms (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_0002_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.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-2@example.com' LIMIT 1
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-2@example.com"], ["confirmation_sent_at", "2015-11-02 16:59:36.008458"], ["confirmed_at", "2015-11-02 16:59:36.008507"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 16:59:36.009899"], ["updated_at", "2015-11-02 16:59:36.009899"]]
-   (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 1  [["id", "10880f8d-69b1-409f-b506-013e2e04e892"]]
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-2@example.com' AND "push_type_users"."id" != '10880f8d-69b1-409f-b506-013e2e04e892') LIMIT 1
-  SQL (0.1ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", "2015-11-02 16:59:36.014650"], ["id", "10880f8d-69b1-409f-b506-013e2e04e892"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Redirected to http://test.host/push_type/profile/edit
-Completed 302 Found in 4ms (ActiveRecord: 0.7ms)
-   (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.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.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-3@example.com' LIMIT 1
-  SQL (0.1ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-3@example.com"], ["confirmation_sent_at", "2015-11-02 16:59:36.017907"], ["confirmed_at", "2015-11-02 16:59:36.017948"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 16:59:36.019347"], ["updated_at", "2015-11-02 16:59:36.019347"]]
-   (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 1  [["id", "0c537ecc-5678-4ab5-8883-d339e8cc90b4"]]
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-3@example.com' AND "push_type_users"."id" != '0c537ecc-5678-4ab5-8883-d339e8cc90b4') LIMIT 1
-  SQL (0.1ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", "2015-11-02 16:59:36.023616"], ["id", "0c537ecc-5678-4ab5-8883-d339e8cc90b4"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Redirected to http://test.host/push_type/profile/edit
-Completed 302 Found in 4ms (ActiveRecord: 0.7ms)
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 LIMIT 1  [["id", "0c537ecc-5678-4ab5-8883-d339e8cc90b4"]]
-   (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.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" = 'joe-4@example.com' LIMIT 1
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-4@example.com' LIMIT 1
-  SQL (0.1ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-4@example.com"], ["confirmation_sent_at", "2015-11-02 16:59:36.028212"], ["confirmed_at", "2015-11-02 16:59:36.028260"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 16:59:36.029671"], ["updated_at", "2015-11-02 16:59:36.029671"]]
-   (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 1  [["id", "e2958d29-b7aa-4d7b-a934-cb101eb16f93"]]
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-4@example.com' AND "push_type_users"."id" != 'e2958d29-b7aa-4d7b-a934-cb101eb16f93') LIMIT 1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_2
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin (12.1ms)
-Completed 200 OK in 10851ms (Views: 10848.1ms | ActiveRecord: 0.5ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.2ms)  ROLLBACK
+   (0.0ms)  ROLLBACK
    (0.1ms)  BEGIN
--------------------------------------------------------------------------------------
-PushType::ProfilesControllerTest::PUT #update::with invalid user: test_0002_anonymous
--------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------------------
+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" = 'joe-5@example.com' LIMIT 1
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-5@example.com' LIMIT 1
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-5@example.com"], ["confirmation_sent_at", "2015-11-02 16:59:46.885149"], ["confirmed_at", "2015-11-02 16:59:46.885231"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 16:59:46.887098"], ["updated_at", "2015-11-02 16:59:46.887098"]]
-   (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 1  [["id", "b3d94bf8-729e-4c8d-9ef7-9cb9b76f553d"]]
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-5@example.com' AND "push_type_users"."id" != 'b3d94bf8-729e-4c8d-9ef7-9cb9b76f553d') LIMIT 1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_2
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin (2.0ms)
-Completed 200 OK in 10ms (Views: 7.0ms | ActiveRecord: 0.5ms)
-   (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.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" = 'joe-6@example.com' LIMIT 1
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-6@example.com' 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 1  [["confirmation_token", "5086a300017642ca9d0928c84f8cfe85e2007fedf816b402bcc84ba91ef8c79a"]]
-  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", "2015-11-02 16:59:46.927241"], ["updated_at", "2015-11-02 16:59:46.927241"], ["confirmation_token", "jN3PS6mGPdcLcxYiVU1q"], ["confirmation_sent_at", "2015-11-02 16:59:47.102634"]]
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.7ms)
+  PushType::User Exists (0.5ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-1@example.com' LIMIT 1
+  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 1  [["confirmation_token", "060a5dbb216b217803bbbacd98dc4bfeca8dde076a51b06907e42eb0515d2b33"]]
+  SQL (0.7ms)  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", "2015-11-02 20:28:16.227736"], ["updated_at", "2015-11-02 20:28:16.227736"], ["confirmation_token", "59ejRKJi8QgrasNmbyei"], ["confirmation_sent_at", "2015-11-02 20:28:16.410147"]]
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (1.5ms)
 
-Devise::Mailer#confirmation_instructions: processed outbound mail in 106.3ms
+Devise::Mailer#confirmation_instructions: processed outbound mail in 265.4ms
 
-Sent mail to joe-6@example.com (6.9ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-1@example.com (7.2ms)
+Date: Mon, 02 Nov 2015 20:28:16 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-6@example.com
-Message-ID: <563796833cad8_2a0d3fff7dc57be893469@Aarons-iMac.local.mail>
+To: joe-1@example.com
+Message-ID: <5637c760af5d4_3b263fcf84c63bec939dc@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_563796833bbaf_2a0d3fff7dc57be893313";
+ boundary="--==_mimepart_5637c760ae531_3b263fcf84c63bec93810";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_563796833bbaf_2a0d3fff7dc57be893313
+----==_mimepart_5637c760ae531_3b263fcf84c63bec93810
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -338,10 +224,10 @@ created for you.
 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=jN3PS6mGPdcLcxYiVU1q )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=59ejRKJi8QgrasNmbyei )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_563796833bbaf_2a0d3fff7dc57be893313
+----==_mimepart_5637c760ae531_3b263fcf84c63bec93810
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -387,7 +273,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=jN3PS6mGPdcLcxYiVU1q" 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/push_type/confirmation?confirmation_token=59ejRKJi8QgrasNmbyei" 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>
@@ -432,55 +318,42 @@ body {
 </body>
 </html>
 
-----==_mimepart_563796833bbaf_2a0d3fff7dc57be893313--
+----==_mimepart_5637c760ae531_3b263fcf84c63bec93810--
 
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"jN3PS6mGPdcLcxYiVU1q", "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 1  [["confirmation_token", "jN3PS6mGPdcLcxYiVU1q"]]
-  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-6@example.com' AND "push_type_users"."id" != 'afe0b1ae-6e4c-4bbc-90a7-88465d4eab7a') 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$3EocGU6w8bX0SNOcr9S0E.XJLGf3RBM7jfFPaQigHTERXIILd2Ar2"], ["confirmed_at", "2015-11-02 16:59:47.279882"], ["updated_at", "2015-11-02 16:59:47.280474"], ["id", "afe0b1ae-6e4c-4bbc-90a7-88465d4eab7a"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-   (0.1ms)  SAVEPOINT active_record_2
-  SQL (0.2ms)  UPDATE "push_type_users" SET "last_sign_in_at" = $1, "current_sign_in_at" = $2, "last_sign_in_ip" = $3, "current_sign_in_ip" = $4, "sign_in_count" = $5, "updated_at" = $6 WHERE "push_type_users"."id" = $7  [["last_sign_in_at", "2015-11-02 16:59:47.282104"], ["current_sign_in_at", "2015-11-02 16:59:47.282104"], ["last_sign_in_ip", "0.0.0.0"], ["current_sign_in_ip", "0.0.0.0"], ["sign_in_count", 1], ["updated_at", "2015-11-02 16:59:47.282625"], ["id", "afe0b1ae-6e4c-4bbc-90a7-88465d4eab7a"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Redirected to http://test.host/push_type/
-Completed 302 Found in 30ms (ActiveRecord: 1.2ms)
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 LIMIT 1  [["id", "afe0b1ae-6e4c-4bbc-90a7-88465d4eab7a"]]
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
+   (0.2ms)  ROLLBACK
    (0.1ms)  BEGIN
-----------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::PUT #update::with valid user: test_0002_anonymous
-----------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------------------
+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.1ms)  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" = 'joe-7@example.com' LIMIT 1
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-7@example.com' 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 1  [["confirmation_token", "bad7e7bba10faf6c99b7bf6a2b362c2d77bc144cb89f8cb513f19072ceee3fd1"]]
-  SQL (0.1ms)  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-7@example.com"], ["created_at", "2015-11-02 16:59:47.288000"], ["updated_at", "2015-11-02 16:59:47.288000"], ["confirmation_token", "7URfEsvgpVDX52za-_EK"], ["confirmation_sent_at", "2015-11-02 16:59:47.288704"]]
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.2ms)
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-2@example.com' 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 1  [["confirmation_token", "0cb3066000f0e8a35605dc8201f9a0e7a5d22530429930a7dd68ff2180c32549"]]
+  SQL (0.1ms)  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", "2015-11-02 20:28:16.734131"], ["updated_at", "2015-11-02 20:28:16.734131"], ["confirmation_token", "W_Yvt2KVPnLAJQjBR4We"], ["confirmation_sent_at", "2015-11-02 20:28:16.735010"]]
+  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.4ms
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.7ms
 
-Sent mail to joe-7@example.com (2.9ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-2@example.com (3.2ms)
+Date: Mon, 02 Nov 2015 20:28:16 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-7@example.com
-Message-ID: <563796834df7b_2a0d3fff7dc57be893733@Aarons-iMac.local.mail>
+To: joe-2@example.com
+Message-ID: <5637c760bbae2_3b263fcf84c63bec9423f@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_563796834da33_2a0d3fff7dc57be893681";
+ boundary="--==_mimepart_5637c760bb559_3b263fcf84c63bec94183";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_563796834da33_2a0d3fff7dc57be893681
+----==_mimepart_5637c760bb559_3b263fcf84c63bec94183
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -495,10 +368,10 @@ created for you.
 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=7URfEsvgpVDX52za-_EK )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=W_Yvt2KVPnLAJQjBR4We )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_563796834da33_2a0d3fff7dc57be893681
+----==_mimepart_5637c760bb559_3b263fcf84c63bec94183
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -544,7 +417,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=7URfEsvgpVDX52za-_EK" 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/push_type/confirmation?confirmation_token=W_Yvt2KVPnLAJQjBR4We" 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>
@@ -589,54 +462,76 @@ body {
 </body>
 </html>
 
-----==_mimepart_563796834da33_2a0d3fff7dc57be893681--
+----==_mimepart_5637c760bb559_3b263fcf84c63bec94183--
 
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"7URfEsvgpVDX52za-_EK", "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 1  [["confirmation_token", "7URfEsvgpVDX52za-_EK"]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-7@example.com' AND "push_type_users"."id" != '6d7790bd-e781-40f6-9ac1-97fd9b5e001e') 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$Flts4NYl5hPw.nG/4cznauWUpzB5Kk.32uzdUfZwNES9TwhsHYqNO"], ["confirmed_at", "2015-11-02 16:59:47.325577"], ["updated_at", "2015-11-02 16:59:47.326095"], ["id", "6d7790bd-e781-40f6-9ac1-97fd9b5e001e"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-   (0.1ms)  SAVEPOINT active_record_2
-  SQL (0.1ms)  UPDATE "push_type_users" SET "last_sign_in_at" = $1, "current_sign_in_at" = $2, "last_sign_in_ip" = $3, "current_sign_in_ip" = $4, "sign_in_count" = $5, "updated_at" = $6 WHERE "push_type_users"."id" = $7  [["last_sign_in_at", "2015-11-02 16:59:47.327327"], ["current_sign_in_at", "2015-11-02 16:59:47.327327"], ["last_sign_in_ip", "0.0.0.0"], ["current_sign_in_ip", "0.0.0.0"], ["sign_in_count", 1], ["updated_at", "2015-11-02 16:59:47.327724"], ["id", "6d7790bd-e781-40f6-9ac1-97fd9b5e001e"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Redirected to http://test.host/push_type/
-Completed 302 Found in 6ms (ActiveRecord: 1.0ms)
    (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
---------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------
+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.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1  ORDER BY "push_type_users"."name" ASC LIMIT 1  [["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 1  [["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 1  [["confirmation_token", "28f7df9a6236f9200910a798dd2926c2089541bdd936c8e1cff259b33244fd39"]]
+  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 (9.0ms)
+Completed 200 OK in 10862ms (Views: 10857.7ms | ActiveRecord: 0.7ms)
+   (0.2ms)  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.1ms)  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 1  [["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 1  [["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 1  [["confirmation_token", "28f7df9a6236f9200910a798dd2926c2089541bdd936c8e1cff259b33244fd39"]]
+  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.5ms)
+Completed 200 OK in 8ms (Views: 5.0ms | ActiveRecord: 0.4ms)
+   (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.1ms)  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.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-8@example.com' LIMIT 1
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-8@example.com' 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 1  [["confirmation_token", "db14a596f2a5766c796c1ed1891008cfcb89c7986be3e839a0d9d0ae5a3cdc23"]]
-  SQL (0.1ms)  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", "2015-11-02 16:59:47.332338"], ["updated_at", "2015-11-02 16:59:47.332338"], ["confirmation_token", "P1qyHXVoxxynsy8qa5WG"], ["confirmation_sent_at", "2015-11-02 16:59:47.333118"]]
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-3@example.com' 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 1  [["confirmation_token", "e1c20e0327e6a8d02591988780b79eef35ae5d96bd01dffb6bcff19a1e14619b"]]
+  SQL (0.1ms)  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-3@example.com"], ["created_at", "2015-11-02 20:28:27.659554"], ["updated_at", "2015-11-02 20:28:27.659554"], ["confirmation_token", "ji6gpVv55s4TzY4zGTnU"], ["confirmation_sent_at", "2015-11-02 20:28:27.660309"]]
   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.3ms
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.5ms
 
-Sent mail to joe-8@example.com (3.0ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-3@example.com (3.3ms)
+Date: Mon, 02 Nov 2015 20:28:27 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-8@example.com
-Message-ID: <5637968358994_2a0d3fff7dc57be894058@Aarons-iMac.local.mail>
+To: joe-3@example.com
+Message-ID: <5637c76ba90b2_3b263fcf84c63bec94515@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_563796835841a_2a0d3fff7dc57be89395d";
+ boundary="--==_mimepart_5637c76ba8b12_3b263fcf84c63bec9448f";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_563796835841a_2a0d3fff7dc57be89395d
+----==_mimepart_5637c76ba8b12_3b263fcf84c63bec9448f
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -651,10 +546,10 @@ created for you.
 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=P1qyHXVoxxynsy8qa5WG )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=ji6gpVv55s4TzY4zGTnU )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_563796835841a_2a0d3fff7dc57be89395d
+----==_mimepart_5637c76ba8b12_3b263fcf84c63bec9448f
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -700,7 +595,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=P1qyHXVoxxynsy8qa5WG" 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/push_type/confirmation?confirmation_token=ji6gpVv55s4TzY4zGTnU" 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>
@@ -745,108 +640,48 @@ body {
 </body>
 </html>
 
-----==_mimepart_563796835841a_2a0d3fff7dc57be89395d--
+----==_mimepart_5637c76ba8b12_3b263fcf84c63bec9448f--
 
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-   (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.0ms)  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.0ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK
-   (0.1ms)  BEGIN
-------------------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::GET #show::with invalid confirmation token: test_0002_anonymous
-------------------------------------------------------------------------------------------------------
-   (0.1ms)  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.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1  ORDER BY "push_type_users"."name" ASC LIMIT 1  [["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 1  [["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 1  [["confirmation_token", "5912ef8b395805b8aaccedf740acc0c9afa2afe691cd77fc01b8baad06332f6f"]]
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.9ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth (5.5ms)
-Completed 200 OK in 15ms (Views: 10.6ms | ActiveRecord: 0.3ms)
+  Parameters: {"confirmation_token"=>"ji6gpVv55s4TzY4zGTnU"}
+  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 1  [["confirmation_token", "ji6gpVv55s4TzY4zGTnU"]]
+  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 (4.8ms)
+Completed 200 OK in 10ms (Views: 8.9ms | ActiveRecord: 0.1ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
-------------------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::GET #show::with invalid confirmation token: test_0001_anonymous
-------------------------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
+----------------------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::GET #show::with valid confirmation token: test_0002_anonymous
+----------------------------------------------------------------------------------------------------
+   (0.1ms)  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 1  [["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 1  [["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 1  [["confirmation_token", "5912ef8b395805b8aaccedf740acc0c9afa2afe691cd77fc01b8baad06332f6f"]]
-  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 7ms (Views: 4.8ms | ActiveRecord: 0.3ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.2ms)  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.0ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
----------------------------------------------------------------
-PushType::UsersControllerTest::PUT #invite: 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" = 'joe-9@example.com' LIMIT 1
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-9@example.com' LIMIT 1
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-9@example.com"], ["confirmation_sent_at", "2015-11-02 16:59:47.399711"], ["confirmed_at", "2015-11-02 16:59:47.399775"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 16:59:47.401342"], ["updated_at", "2015-11-02 16:59:47.401342"]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
+   (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-10@example.com' 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 1  [["confirmation_token", "78904a0a3bab70977724f0f4461ad10956de4fd02e80a9445b0c4271f97ebea5"]]
-  SQL (0.1ms)  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", "2015-11-02 16:59:47.404172"], ["updated_at", "2015-11-02 16:59:47.404172"], ["confirmation_token", "QfD3UkRjymTPyFXujMve"], ["confirmation_sent_at", "2015-11-02 16:59:47.404868"]]
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-4@example.com' 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 1  [["confirmation_token", "c1c471c1e4cd2ff6833102522aeb6387fc3ec92bf9e2baa393227e5ede0a9d90"]]
+  SQL (0.1ms)  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", "2015-11-02 20:28:27.709452"], ["updated_at", "2015-11-02 20:28:27.709452"], ["confirmation_token", "Hv4_6NNm5nVQyCxMZmMa"], ["confirmation_sent_at", "2015-11-02 20:28:27.710203"]]
+  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
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.3ms
 
-Sent mail to joe-10@example.com (3.0ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-4@example.com (3.2ms)
+Date: Mon, 02 Nov 2015 20:28:27 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-10@example.com
-Message-ID: <563796837f35f_2a0d3fff7dc57be89436@Aarons-iMac.local.mail>
+To: joe-4@example.com
+Message-ID: <5637c76bb50ac_3b263fcf84c63bec94832@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_563796837edfd_2a0d3fff7dc57be894249";
+ boundary="--==_mimepart_5637c76bb4ace_3b263fcf84c63bec9476";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_563796837edfd_2a0d3fff7dc57be894249
+----==_mimepart_5637c76bb4ace_3b263fcf84c63bec9476
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -861,10 +696,10 @@ created for you.
 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=QfD3UkRjymTPyFXujMve )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=Hv4_6NNm5nVQyCxMZmMa )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_563796837edfd_2a0d3fff7dc57be894249
+----==_mimepart_5637c76bb4ace_3b263fcf84c63bec9476
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -910,7 +745,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=QfD3UkRjymTPyFXujMve" 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/push_type/confirmation?confirmation_token=Hv4_6NNm5nVQyCxMZmMa" 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>
@@ -955,34 +790,80 @@ body {
 </body>
 </html>
 
-----==_mimepart_563796837edfd_2a0d3fff7dc57be894249--
+----==_mimepart_5637c76bb4ace_3b263fcf84c63bec9476--
 
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::UsersController#invite as HTML
-  Parameters: {"id"=>"a0d8bde1-9063-4185-8922-f94d10983218"}
-  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 1  [["id", "e0f505ca-7787-4625-9be3-e9fd13e2a5cb"]]
-  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 1  [["id", "a0d8bde1-9063-4185-8922-f94d10983218"]]
-   (0.1ms)  SAVEPOINT active_record_2
+Processing by PushType::ConfirmationsController#show as HTML
+  Parameters: {"confirmation_token"=>"Hv4_6NNm5nVQyCxMZmMa"}
+  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 1  [["confirmation_token", "Hv4_6NNm5nVQyCxMZmMa"]]
+  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 6ms (Views: 5.2ms | ActiveRecord: 0.1ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+PushType::AuthenticatableTest::confirmable: 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::recoverable: 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.1ms)  BEGIN
+----------------------------------------------------
+PushType::InvitationMethodsTest: 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::UsersControllerTest::PUT #invite: 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" = 'joe-5@example.com' LIMIT 1
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-5@example.com' LIMIT 1
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-5@example.com"], ["confirmation_sent_at", "2015-11-02 20:28:27.758692"], ["confirmed_at", "2015-11-02 20:28:27.758763"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 20:28:27.760506"], ["updated_at", "2015-11-02 20:28:27.760506"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.2ms)
+   (0.0ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-6@example.com' LIMIT 1
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-6@example.com' 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 1  [["confirmation_token", "9bdc8a3d5b27db0483f2d49160216909599887deb245c2ffb5e2d974db577e19"]]
+  SQL (0.1ms)  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", "2015-11-02 20:28:27.763393"], ["updated_at", "2015-11-02 20:28:27.763393"], ["confirmation_token", "_bxoS-8bD6zLarnXvCmp"], ["confirmation_sent_at", "2015-11-02 20:28:27.764167"]]
+  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.3ms
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.6ms
 
-Sent mail to joe-10@example.com (3.1ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-6@example.com (3.1ms)
+Date: Mon, 02 Nov 2015 20:28:27 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-10@example.com
-Message-ID: <56379683880a9_2a0d3fff7dc57be8946fd@Aarons-iMac.local.mail>
+To: joe-6@example.com
+Message-ID: <5637c76bc257e_3b263fcf84c63bec951f@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_5637968387b80_2a0d3fff7dc57be89458c";
+ boundary="--==_mimepart_5637c76bc1fea_3b263fcf84c63bec950c3";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_5637968387b80_2a0d3fff7dc57be89458c
+----==_mimepart_5637c76bc1fea_3b263fcf84c63bec950c3
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -997,10 +878,10 @@ created for you.
 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=QfD3UkRjymTPyFXujMve )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=_bxoS-8bD6zLarnXvCmp )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_5637968387b80_2a0d3fff7dc57be89458c
+----==_mimepart_5637c76bc1fea_3b263fcf84c63bec950c3
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1046,7 +927,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=QfD3UkRjymTPyFXujMve" 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/push_type/confirmation?confirmation_token=_bxoS-8bD6zLarnXvCmp" 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>
@@ -1091,48 +972,34 @@ body {
 </body>
 </html>
 
-----==_mimepart_5637968387b80_2a0d3fff7dc57be89458c--
+----==_mimepart_5637c76bc1fea_3b263fcf84c63bec950c3--
 
-Redirected to /push_type/users
-Completed 302 Found in 34ms (ActiveRecord: 0.5ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
----------------------------------------------------------------
-PushType::UsersControllerTest::PUT #invite: test_0001_anonymous
----------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::UsersController#invite as HTML
+  Parameters: {"id"=>"8e553283-c837-4891-93a5-7bbbc27ae66b"}
+  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 1  [["id", "90031e60-fbf7-4220-9685-fa8596e8b603"]]
+  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 1  [["id", "8e553283-c837-4891-93a5-7bbbc27ae66b"]]
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-11@example.com' LIMIT 1
-  SQL (0.1ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-11@example.com"], ["confirmation_sent_at", "2015-11-02 16:59:47.561475"], ["confirmed_at", "2015-11-02 16:59:47.561536"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 16:59:47.563165"], ["updated_at", "2015-11-02 16:59:47.563165"]]
-   (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" = 'joe-12@example.com' LIMIT 1
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-12@example.com' 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 1  [["confirmation_token", "9f538f65f85cb0ba3c9558f2ce160a43a9634ab7691b3ce6416654d5446b9797"]]
-  SQL (0.1ms)  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-12@example.com"], ["created_at", "2015-11-02 16:59:47.565859"], ["updated_at", "2015-11-02 16:59:47.565859"], ["confirmation_token", "gYHzp7eggMJfXvucHgay"], ["confirmation_sent_at", "2015-11-02 16:59:47.566548"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
   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.3ms
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.4ms
 
-Sent mail to joe-12@example.com (3.1ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-6@example.com (3.0ms)
+Date: Mon, 02 Nov 2015 20:28:27 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-12@example.com
-Message-ID: <5637968391e72_2a0d3fff7dc57be89495f@Aarons-iMac.local.mail>
+To: joe-6@example.com
+Message-ID: <5637c76bcb6d1_3b263fcf84c63bec95474@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_5637968391869_2a0d3fff7dc57be894834";
+ boundary="--==_mimepart_5637c76bcb141_3b263fcf84c63bec95395";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_5637968391869_2a0d3fff7dc57be894834
+----==_mimepart_5637c76bcb141_3b263fcf84c63bec95395
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1147,10 +1014,10 @@ created for you.
 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=gYHzp7eggMJfXvucHgay )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=_bxoS-8bD6zLarnXvCmp )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_5637968391869_2a0d3fff7dc57be894834
+----==_mimepart_5637c76bcb141_3b263fcf84c63bec95395
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1196,7 +1063,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=gYHzp7eggMJfXvucHgay" 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/push_type/confirmation?confirmation_token=_bxoS-8bD6zLarnXvCmp" 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>
@@ -1241,34 +1108,48 @@ body {
 </body>
 </html>
 
-----==_mimepart_5637968391869_2a0d3fff7dc57be894834--
+----==_mimepart_5637c76bcb141_3b263fcf84c63bec95395--
 
+Redirected to /push_type/users
+Completed 302 Found in 35ms (ActiveRecord: 0.5ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+PushType::UsersControllerTest::PUT #invite: 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" = 'joe-7@example.com' LIMIT 1
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-7@example.com' LIMIT 1
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-7@example.com"], ["confirmation_sent_at", "2015-11-02 20:28:27.837600"], ["confirmed_at", "2015-11-02 20:28:27.837661"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 20:28:27.839352"], ["updated_at", "2015-11-02 20:28:27.839352"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::UsersController#invite as HTML
-  Parameters: {"id"=>"b8a50076-3e93-499b-9d25-76680ab361f8"}
-  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 1  [["id", "d95f4911-dd4a-4a89-b3b1-e530f7197571"]]
-  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 1  [["id", "b8a50076-3e93-499b-9d25-76680ab361f8"]]
    (0.1ms)  SAVEPOINT active_record_2
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.2ms)
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-8@example.com' 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 1  [["confirmation_token", "dce89aebd270973836ef57f3d56d5eecacd88a0d42dc73c7df4551fea761ca44"]]
+  SQL (0.1ms)  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", "2015-11-02 20:28:27.842179"], ["updated_at", "2015-11-02 20:28:27.842179"], ["confirmation_token", "sARd_cmnYbb-Yn91p5zm"], ["confirmation_sent_at", "2015-11-02 20:28:27.842909"]]
+  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.2ms
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.5ms
 
-Sent mail to joe-12@example.com (2.9ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-8@example.com (3.0ms)
+Date: Mon, 02 Nov 2015 20:28:27 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-12@example.com
-Message-ID: <563796839a825_2a0d3fff7dc57be89521e@Aarons-iMac.local.mail>
+To: joe-8@example.com
+Message-ID: <5637c76bd57c5_3b263fcf84c63bec9577c@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_563796839a2ea_2a0d3fff7dc57be89518";
+ boundary="--==_mimepart_5637c76bd523e_3b263fcf84c63bec95614";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_563796839a2ea_2a0d3fff7dc57be89518
+----==_mimepart_5637c76bd523e_3b263fcf84c63bec95614
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1283,10 +1164,10 @@ created for you.
 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=gYHzp7eggMJfXvucHgay )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=sARd_cmnYbb-Yn91p5zm )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_563796839a2ea_2a0d3fff7dc57be89518
+----==_mimepart_5637c76bd523e_3b263fcf84c63bec95614
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1332,7 +1213,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=gYHzp7eggMJfXvucHgay" 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/push_type/confirmation?confirmation_token=sARd_cmnYbb-Yn91p5zm" 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>
@@ -1377,48 +1258,34 @@ body {
 </body>
 </html>
 
-----==_mimepart_563796839a2ea_2a0d3fff7dc57be89518--
+----==_mimepart_5637c76bd523e_3b263fcf84c63bec95614--
 
-Redirected to /push_type/users
-Completed 302 Found in 34ms (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.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::UsersController#invite as HTML
+  Parameters: {"id"=>"fcfa4fdd-76d7-4582-8436-50b855faac8c"}
+  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 1  [["id", "717e9d06-f742-4b4a-96d4-1ae094a0c7f6"]]
+  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 1  [["id", "fcfa4fdd-76d7-4582-8436-50b855faac8c"]]
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-13@example.com' LIMIT 1
-  SQL (0.1ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-13@example.com"], ["confirmation_sent_at", "2015-11-02 16:59:47.636777"], ["confirmed_at", "2015-11-02 16:59:47.636836"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 16:59:47.638408"], ["updated_at", "2015-11-02 16:59:47.638408"]]
-   (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" = 'joe-14@example.com' LIMIT 1
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-14@example.com' 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 1  [["confirmation_token", "c514fcaf5a8e478d9008486d909f81041e8315d44d3912e57f09e84d82847c2b"]]
-  SQL (0.1ms)  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", "2015-11-02 16:59:47.640986"], ["updated_at", "2015-11-02 16:59:47.640986"], ["confirmation_token", "5r-shr8nEwAfCncaNw-9"], ["confirmation_sent_at", "2015-11-02 16:59:47.641630"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
   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.2ms
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.3ms
 
-Sent mail to joe-14@example.com (3.0ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-8@example.com (2.9ms)
+Date: Mon, 02 Nov 2015 20:28:27 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-14@example.com
-Message-ID: <56379683a4820_2a0d3fff7dc57be89557b@Aarons-iMac.local.mail>
+To: joe-8@example.com
+Message-ID: <5637c76bde2d8_3b263fcf84c63bec960e8@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_56379683a4294_2a0d3fff7dc57be895446";
+ boundary="--==_mimepart_5637c76bdddd2_3b263fcf84c63bec9594f";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_56379683a4294_2a0d3fff7dc57be895446
+----==_mimepart_5637c76bdddd2_3b263fcf84c63bec9594f
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1433,10 +1300,10 @@ created for you.
 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=5r-shr8nEwAfCncaNw-9 )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=sARd_cmnYbb-Yn91p5zm )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_56379683a4294_2a0d3fff7dc57be895446
+----==_mimepart_5637c76bdddd2_3b263fcf84c63bec9594f
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1482,7 +1349,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=5r-shr8nEwAfCncaNw-9" 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/push_type/confirmation?confirmation_token=sARd_cmnYbb-Yn91p5zm" 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>
@@ -1527,34 +1394,48 @@ body {
 </body>
 </html>
 
-----==_mimepart_56379683a4294_2a0d3fff7dc57be895446--
+----==_mimepart_5637c76bdddd2_3b263fcf84c63bec9594f--
 
+Redirected to /push_type/users
+Completed 302 Found in 34ms (ActiveRecord: 0.7ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+PushType::UsersControllerTest::PUT #invite: test_0001_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" = 'joe-9@example.com' LIMIT 1
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-9@example.com' LIMIT 1
+  SQL (0.1ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-9@example.com"], ["confirmation_sent_at", "2015-11-02 20:28:27.914098"], ["confirmed_at", "2015-11-02 20:28:27.914179"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 20:28:27.915723"], ["updated_at", "2015-11-02 20:28:27.915723"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::UsersController#invite as HTML
-  Parameters: {"id"=>"0583c5fd-3e1e-4c7c-b779-5f002793dfea"}
-  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 1  [["id", "e0ef9a0e-8c82-43da-8c40-1fda4d39bf2c"]]
-  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 1  [["id", "0583c5fd-3e1e-4c7c-b779-5f002793dfea"]]
    (0.1ms)  SAVEPOINT active_record_2
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-10@example.com' 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 1  [["confirmation_token", "5d29b887aa967220553cb678de3b2dde4e0ff4a131071a2562f0a67ec3580765"]]
+  SQL (0.1ms)  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", "2015-11-02 20:28:27.918483"], ["updated_at", "2015-11-02 20:28:27.918483"], ["confirmation_token", "z7Jhxm9LMeDb5tnV8VMe"], ["confirmation_sent_at", "2015-11-02 20:28:27.919160"]]
   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.2ms
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.4ms
 
-Sent mail to joe-14@example.com (2.9ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-10@example.com (3.0ms)
+Date: Mon, 02 Nov 2015 20:28:27 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-14@example.com
-Message-ID: <56379683ad0c2_2a0d3fff7dc57be895821@Aarons-iMac.local.mail>
+To: joe-10@example.com
+Message-ID: <5637c76be7fcd_3b263fcf84c63bec963e9@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_56379683acba5_2a0d3fff7dc57be895724";
+ boundary="--==_mimepart_5637c76be79e6_3b263fcf84c63bec9624c";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_56379683acba5_2a0d3fff7dc57be895724
+----==_mimepart_5637c76be79e6_3b263fcf84c63bec9624c
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1569,10 +1450,10 @@ created for you.
 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=5r-shr8nEwAfCncaNw-9 )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=z7Jhxm9LMeDb5tnV8VMe )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_56379683acba5_2a0d3fff7dc57be895724
+----==_mimepart_5637c76be79e6_3b263fcf84c63bec9624c
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1618,7 +1499,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=5r-shr8nEwAfCncaNw-9" 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/push_type/confirmation?confirmation_token=z7Jhxm9LMeDb5tnV8VMe" 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>
@@ -1663,61 +1544,34 @@ body {
 </body>
 </html>
 
-----==_mimepart_56379683acba5_2a0d3fff7dc57be895724--
+----==_mimepart_5637c76be79e6_3b263fcf84c63bec9624c--
 
-Redirected to /push_type/users
-Completed 302 Found in 34ms (ActiveRecord: 0.4ms)
-   (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
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
-----------------------------------------------------------------
-PushType::AuthenticatableTest::rememberable: 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.0ms)  BEGIN
-----------------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::GET #show::with valid confirmation token: test_0001_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" = 'joe-15@example.com' LIMIT 1
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-15@example.com' 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 1  [["confirmation_token", "ce68a03d06c03ce3a6895bfe8d50e7b4798d92a13227e1b7b7e7e0a859dcf9b2"]]
-  SQL (0.1ms)  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", "2015-11-02 16:59:47.718788"], ["updated_at", "2015-11-02 16:59:47.718788"], ["confirmation_token", "ojUinCQ242dipt2MwAQg"], ["confirmation_sent_at", "2015-11-02 16:59:47.719488"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::UsersController#invite as HTML
+  Parameters: {"id"=>"ff177457-1030-4a19-9132-52f2fc31e7f9"}
+  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 1  [["id", "d7a58e34-eeab-42b5-ba58-299f7e931490"]]
+  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 1  [["id", "ff177457-1030-4a19-9132-52f2fc31e7f9"]]
+   (0.1ms)  SAVEPOINT active_record_2
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
   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.2ms
 
-Sent mail to joe-15@example.com (2.9ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-10@example.com (2.9ms)
+Date: Mon, 02 Nov 2015 20:28:27 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-15@example.com
-Message-ID: <56379683b6f29_2a0d3fff7dc57be8961ce@Aarons-iMac.local.mail>
+To: joe-10@example.com
+Message-ID: <5637c76bf09a4_3b263fcf84c63bec966f7@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_56379683b69e0_2a0d3fff7dc57be89603";
+ boundary="--==_mimepart_5637c76bf0494_3b263fcf84c63bec9655d";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_56379683b69e0_2a0d3fff7dc57be89603
+----==_mimepart_5637c76bf0494_3b263fcf84c63bec9655d
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1732,10 +1586,10 @@ created for you.
 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=ojUinCQ242dipt2MwAQg )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=z7Jhxm9LMeDb5tnV8VMe )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_56379683b69e0_2a0d3fff7dc57be89603
+----==_mimepart_5637c76bf0494_3b263fcf84c63bec9655d
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1781,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=ojUinCQ242dipt2MwAQg" 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/push_type/confirmation?confirmation_token=z7Jhxm9LMeDb5tnV8VMe" 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>
@@ -1826,48 +1680,193 @@ body {
 </body>
 </html>
 
-----==_mimepart_56379683b69e0_2a0d3fff7dc57be89603--
+----==_mimepart_5637c76bf0494_3b263fcf84c63bec9655d--
 
+Redirected to /push_type/users
+Completed 302 Found in 34ms (ActiveRecord: 0.5ms)
+   (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.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" = 'joe-11@example.com' LIMIT 1
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-11@example.com' LIMIT 1
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-11@example.com"], ["confirmation_sent_at", "2015-11-02 20:28:27.993031"], ["confirmed_at", "2015-11-02 20:28:27.993094"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 20:28:27.994799"], ["updated_at", "2015-11-02 20:28:27.994799"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::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 1  [["id", "accc4f3a-7a89-4c8f-8813-5f02d44834e6"]]
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-11@example.com' AND "push_type_users"."id" != 'accc4f3a-7a89-4c8f-8813-5f02d44834e6') LIMIT 1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_2
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin (5.2ms)
+Completed 200 OK in 25ms (Views: 21.7ms | ActiveRecord: 0.5ms)
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+-------------------------------------------------------------------------------------
+PushType::ProfilesControllerTest::PUT #update::with invalid user: test_0002_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" = 'joe-12@example.com' LIMIT 1
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-12@example.com' LIMIT 1
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-12@example.com"], ["confirmation_sent_at", "2015-11-02 20:28:28.025101"], ["confirmed_at", "2015-11-02 20:28:28.025168"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 20:28:28.026692"], ["updated_at", "2015-11-02 20:28:28.026692"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::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 1  [["id", "344f0aa5-c254-4d6f-a998-d34ae8187a35"]]
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-12@example.com' AND "push_type_users"."id" != '344f0aa5-c254-4d6f-a998-d34ae8187a35') LIMIT 1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_2
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin (1.8ms)
+Completed 200 OK in 10ms (Views: 7.0ms | ActiveRecord: 0.4ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+-----------------------------------------------------------------------------------
+PushType::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" = 'joe-13@example.com' LIMIT 1
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-13@example.com' LIMIT 1
+  SQL (0.1ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-13@example.com"], ["confirmation_sent_at", "2015-11-02 20:28:28.040866"], ["confirmed_at", "2015-11-02 20:28:28.040925"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 20:28:28.042486"], ["updated_at", "2015-11-02 20:28:28.042486"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::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 1  [["id", "d31322a9-bb6d-4c87-a45f-36793e8a49e9"]]
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-13@example.com' AND "push_type_users"."id" != 'd31322a9-bb6d-4c87-a45f-36793e8a49e9') 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", "2015-11-02 20:28:28.046501"], ["id", "d31322a9-bb6d-4c87-a45f-36793e8a49e9"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Redirected to http://test.host/push_type/profile/edit
+Completed 302 Found in 4ms (ActiveRecord: 0.7ms)
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 LIMIT 1  [["id", "d31322a9-bb6d-4c87-a45f-36793e8a49e9"]]
+   (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.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.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-14@example.com' LIMIT 1
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-14@example.com' LIMIT 1
+  SQL (0.1ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-14@example.com"], ["confirmation_sent_at", "2015-11-02 20:28:28.051152"], ["confirmed_at", "2015-11-02 20:28:28.051198"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 20:28:28.052476"], ["updated_at", "2015-11-02 20:28:28.052476"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::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 1  [["id", "19d4d57f-822f-4464-91ed-71a90674d6bb"]]
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-14@example.com' AND "push_type_users"."id" != '19d4d57f-822f-4464-91ed-71a90674d6bb') LIMIT 1
+  SQL (0.1ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", "2015-11-02 20:28:28.056349"], ["id", "19d4d57f-822f-4464-91ed-71a90674d6bb"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Redirected to http://test.host/push_type/profile/edit
+Completed 302 Found in 3ms (ActiveRecord: 0.6ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+-----------------------------------------------------------------------------------
+PushType::ProfilesControllerTest::PUT #update::with valid user: test_0003_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" = 'joe-15@example.com' LIMIT 1
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-15@example.com' LIMIT 1
+  SQL (0.1ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-15@example.com"], ["confirmation_sent_at", "2015-11-02 20:28:28.059231"], ["confirmed_at", "2015-11-02 20:28:28.059317"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 20:28:28.060793"], ["updated_at", "2015-11-02 20:28:28.060793"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::ConfirmationsController#show as HTML
-  Parameters: {"confirmation_token"=>"ojUinCQ242dipt2MwAQg"}
-  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 1  [["confirmation_token", "ojUinCQ242dipt2MwAQg"]]
-  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 (4.0ms)
-Completed 200 OK in 9ms (Views: 8.1ms | ActiveRecord: 0.1ms)
+Processing by PushType::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 1  [["id", "c920f327-6cab-45d0-b84f-676a9736f4a1"]]
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-15@example.com' AND "push_type_users"."id" != 'c920f327-6cab-45d0-b84f-676a9736f4a1') LIMIT 1
+  SQL (0.1ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", "2015-11-02 20:28:28.065124"], ["id", "c920f327-6cab-45d0-b84f-676a9736f4a1"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Redirected to http://test.host/push_type/profile/edit
+Completed 302 Found in 4ms (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_0002_anonymous
-----------------------------------------------------------------------------------------------------
+----------------------------------------------------------------
+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" = 'joe-16@example.com' LIMIT 1
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-16@example.com' LIMIT 1
+  SQL (0.1ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-16@example.com"], ["confirmation_sent_at", "2015-11-02 20:28:28.069938"], ["confirmed_at", "2015-11-02 20:28:28.069983"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 20:28:28.071454"], ["updated_at", "2015-11-02 20:28:28.071454"]]
+   (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 1  [["id", "0776829b-2ce0-4b09-90de-ca70a4dc74c4"]]
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin (1.8ms)
+Completed 200 OK in 8ms (Views: 7.0ms | ActiveRecord: 0.1ms)
+   (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.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" = 'joe-17@example.com' LIMIT 1
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-17@example.com' LIMIT 1
+  SQL (0.1ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-17@example.com"], ["confirmation_sent_at", "2015-11-02 20:28:28.082872"], ["confirmed_at", "2015-11-02 20:28:28.082927"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 20:28:28.084419"], ["updated_at", "2015-11-02 20:28:28.084419"]]
+   (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 1  [["id", "0fa8c988-633f-455a-a276-8ba47f4a25c9"]]
+  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 8ms (Views: 6.8ms | ActiveRecord: 0.1ms)
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::PUT #update::with valid user: test_0002_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" = 'joe-16@example.com' LIMIT 1
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-16@example.com' 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 1  [["confirmation_token", "e784ecd10f1eac49e137a632739fe808b3f3f079a9efce537b16de3d3513531f"]]
-  SQL (0.1ms)  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", "2015-11-02 16:59:47.764738"], ["updated_at", "2015-11-02 16:59:47.764738"], ["confirmation_token", "cA_MkSjuxxfzeox_nsLX"], ["confirmation_sent_at", "2015-11-02 16:59:47.765460"]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-18@example.com' 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 1  [["confirmation_token", "8ff1dc8f021328912901fc1a039cf14c441e755b8c61362e2a66246efd7918b2"]]
+  SQL (0.1ms)  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", "2015-11-02 20:28:28.098197"], ["updated_at", "2015-11-02 20:28:28.098197"], ["confirmation_token", "Woe5rN-8KD_p5yxJuAa5"], ["confirmation_sent_at", "2015-11-02 20:28:28.098913"]]
   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
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.5ms
 
-Sent mail to joe-16@example.com (3.2ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-18@example.com (3.2ms)
+Date: Mon, 02 Nov 2015 20:28:28 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-16@example.com
-Message-ID: <56379683c246e_2a0d3fff7dc57be89648b@Aarons-iMac.local.mail>
+To: joe-18@example.com
+Message-ID: <5637c76c1fb29_3b263fcf84c63bec9694c@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_56379683c1e90_2a0d3fff7dc57be8963e6";
+ boundary="--==_mimepart_5637c76c1f531_3b263fcf84c63bec968f7";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_56379683c1e90_2a0d3fff7dc57be8963e6
+----==_mimepart_5637c76c1f531_3b263fcf84c63bec968f7
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1882,10 +1881,10 @@ created for you.
 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=cA_MkSjuxxfzeox_nsLX )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=Woe5rN-8KD_p5yxJuAa5 )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_56379683c1e90_2a0d3fff7dc57be8963e6
+----==_mimepart_5637c76c1f531_3b263fcf84c63bec968f7
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1931,7 +1930,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=cA_MkSjuxxfzeox_nsLX" 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/push_type/confirmation?confirmation_token=Woe5rN-8KD_p5yxJuAa5" 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>
@@ -1976,48 +1975,54 @@ body {
 </body>
 </html>
 
-----==_mimepart_56379683c1e90_2a0d3fff7dc57be8963e6--
+----==_mimepart_5637c76c1f531_3b263fcf84c63bec968f7--
 
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::ConfirmationsController#show as HTML
-  Parameters: {"confirmation_token"=>"cA_MkSjuxxfzeox_nsLX"}
-  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 1  [["confirmation_token", "cA_MkSjuxxfzeox_nsLX"]]
-  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 6ms (Views: 4.9ms | ActiveRecord: 0.1ms)
-   (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.0ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-17@example.com' LIMIT 1
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-17@example.com' 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 1  [["confirmation_token", "3aac86f3827e9c45a92337889c7e4bd26e1b33c418977a8c2cddd668ce531f91"]]
-  SQL (0.1ms)  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-17@example.com"], ["created_at", "2015-11-02 16:59:47.808821"], ["updated_at", "2015-11-02 16:59:47.808821"], ["confirmation_token", "u-k1qMEsyqiFe_1afsd_"], ["confirmation_sent_at", "2015-11-02 16:59:47.809535"]]
+Processing by PushType::ConfirmationsController#update as HTML
+  Parameters: {"user"=>{"confirmation_token"=>"Woe5rN-8KD_p5yxJuAa5", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
+  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 1  [["confirmation_token", "Woe5rN-8KD_p5yxJuAa5"]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-18@example.com' AND "push_type_users"."id" != '1895c312-c7ae-4117-a614-45fd6359c2b9') 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$X/Y4zpYBNVu4eXa8p8URp.zP8.setRGVQZbSznllxMJs0Yxvlrjrq"], ["confirmed_at", "2015-11-02 20:28:28.136323"], ["updated_at", "2015-11-02 20:28:28.136733"], ["id", "1895c312-c7ae-4117-a614-45fd6359c2b9"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+   (0.1ms)  SAVEPOINT active_record_2
+  SQL (0.2ms)  UPDATE "push_type_users" SET "last_sign_in_at" = $1, "current_sign_in_at" = $2, "last_sign_in_ip" = $3, "current_sign_in_ip" = $4, "sign_in_count" = $5, "updated_at" = $6 WHERE "push_type_users"."id" = $7  [["last_sign_in_at", "2015-11-02 20:28:28.138206"], ["current_sign_in_at", "2015-11-02 20:28:28.138206"], ["last_sign_in_ip", "0.0.0.0"], ["current_sign_in_ip", "0.0.0.0"], ["sign_in_count", 1], ["updated_at", "2015-11-02 20:28:28.138735"], ["id", "1895c312-c7ae-4117-a614-45fd6359c2b9"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Redirected to http://test.host/push_type/
+Completed 302 Found in 7ms (ActiveRecord: 1.0ms)
+   (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.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-19@example.com' 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 1  [["confirmation_token", "ee6676cf38cacc6a03921c808d96f2689acf1dd078cab61b65dc78fc11f4a713"]]
+  SQL (0.1ms)  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-19@example.com"], ["created_at", "2015-11-02 20:28:28.143508"], ["updated_at", "2015-11-02 20:28:28.143508"], ["confirmation_token", "_zAj1_psLqz-exVYEvkK"], ["confirmation_sent_at", "2015-11-02 20:28:28.144231"]]
   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.2ms
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.6ms
 
-Sent mail to joe-17@example.com (3.0ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-19@example.com (3.1ms)
+Date: Mon, 02 Nov 2015 20:28:28 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-17@example.com
-Message-ID: <56379683cd10c_2a0d3fff7dc57be89675f@Aarons-iMac.local.mail>
+To: joe-19@example.com
+Message-ID: <5637c76c2aa2b_3b263fcf84c63bec97215@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_56379683ccba5_2a0d3fff7dc57be896625";
+ boundary="--==_mimepart_5637c76c2a4ce_3b263fcf84c63bec97187";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_56379683ccba5_2a0d3fff7dc57be896625
+----==_mimepart_5637c76c2a4ce_3b263fcf84c63bec97187
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2032,10 +2037,10 @@ created for you.
 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=u-k1qMEsyqiFe_1afsd_ )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=_zAj1_psLqz-exVYEvkK )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_56379683ccba5_2a0d3fff7dc57be896625
+----==_mimepart_5637c76c2a4ce_3b263fcf84c63bec97187
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2081,7 +2086,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=u-k1qMEsyqiFe_1afsd_" 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/push_type/confirmation?confirmation_token=_zAj1_psLqz-exVYEvkK" 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>
@@ -2126,49 +2131,109 @@ body {
 </body>
 </html>
 
-----==_mimepart_56379683ccba5_2a0d3fff7dc57be896625--
+----==_mimepart_5637c76c2a4ce_3b263fcf84c63bec97187--
 
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
 Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"u-k1qMEsyqiFe_1afsd_", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
-  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 1  [["confirmation_token", "u-k1qMEsyqiFe_1afsd_"]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-17@example.com' AND "push_type_users"."id" != 'd5cbdf95-d2bb-47b9-9926-a6695700602b') LIMIT 1
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.2ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (1.5ms)
-Completed 200 OK in 8ms (Views: 5.4ms | ActiveRecord: 0.3ms)
+  Parameters: {"user"=>{"confirmation_token"=>"_zAj1_psLqz-exVYEvkK", "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 1  [["confirmation_token", "_zAj1_psLqz-exVYEvkK"]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-19@example.com' AND "push_type_users"."id" != '2a037ca6-65e9-4c79-85f5-b5536c337226') 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$gXAv/OgQyAfGeo06uezfS.n6RVA/xFDItkEIiLCv9n27jUoUWzkqq"], ["confirmed_at", "2015-11-02 20:28:28.181129"], ["updated_at", "2015-11-02 20:28:28.181571"], ["id", "2a037ca6-65e9-4c79-85f5-b5536c337226"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+   (0.1ms)  SAVEPOINT active_record_2
+  SQL (0.1ms)  UPDATE "push_type_users" SET "last_sign_in_at" = $1, "current_sign_in_at" = $2, "last_sign_in_ip" = $3, "current_sign_in_ip" = $4, "sign_in_count" = $5, "updated_at" = $6 WHERE "push_type_users"."id" = $7  [["last_sign_in_at", "2015-11-02 20:28:28.182835"], ["current_sign_in_at", "2015-11-02 20:28:28.182835"], ["last_sign_in_ip", "0.0.0.0"], ["current_sign_in_ip", "0.0.0.0"], ["sign_in_count", 1], ["updated_at", "2015-11-02 20:28:28.183272"], ["id", "2a037ca6-65e9-4c79-85f5-b5536c337226"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Redirected to http://test.host/push_type/
+Completed 302 Found in 7ms (ActiveRecord: 1.0ms)
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 LIMIT 1  [["id", "2a037ca6-65e9-4c79-85f5-b5536c337226"]]
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
-------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0002_anonymous
-------------------------------------------------------------------------------------------
+---------------------------------------------------------------
+PushType::AuthenticatableTest::validatable: 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::AuthenticatableTest::validatable: test_0002_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.0ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------------
+PushType::AuthenticatableTest::trackable: 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.0ms)  BEGIN
+---------------------------------------------------------------------------
+PushType::AuthenticatableTest::database_athenticatable: test_0001_anonymous
+---------------------------------------------------------------------------
    (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" = 'joe-18@example.com' LIMIT 1
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-18@example.com' 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 1  [["confirmation_token", "78ad055cb7274b58e0a33dac119182519c8fcb4748038073d004227b24a00ffb"]]
-  SQL (0.1ms)  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", "2015-11-02 16:59:47.854328"], ["updated_at", "2015-11-02 16:59:47.854328"], ["confirmation_token", "CyK1Fht_jHJttZwbXsSw"], ["confirmation_sent_at", "2015-11-02 16:59:47.855177"]]
+   (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::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.0ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.0ms)  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.1ms)  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.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" = 'joe-20@example.com' LIMIT 1
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-20@example.com' 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 1  [["confirmation_token", "413a383e8b43164f38bbffa69c743ee896628a0b1c09e2c57a8467a98832f841"]]
+  SQL (0.1ms)  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", "2015-11-02 20:28:28.199409"], ["updated_at", "2015-11-02 20:28:28.199409"], ["confirmation_token", "75vpx6fuqwdrWdfHwuj-"], ["confirmation_sent_at", "2015-11-02 20:28:28.200129"]]
   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.3ms
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.4ms
 
-Sent mail to joe-18@example.com (3.1ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-20@example.com (3.0ms)
+Date: Mon, 02 Nov 2015 20:28:28 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-18@example.com
-Message-ID: <56379683d8210_2a0d3fff7dc57be89701d@Aarons-iMac.local.mail>
+To: joe-20@example.com
+Message-ID: <5637c76c38866_3b263fcf84c63bec97524@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_56379683d7cd0_2a0d3fff7dc57be89696a";
+ boundary="--==_mimepart_5637c76c38314_3b263fcf84c63bec97427";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_56379683d7cd0_2a0d3fff7dc57be89696a
+----==_mimepart_5637c76c38314_3b263fcf84c63bec97427
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2183,10 +2248,10 @@ created for you.
 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=CyK1Fht_jHJttZwbXsSw )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=75vpx6fuqwdrWdfHwuj- )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_56379683d7cd0_2a0d3fff7dc57be89696a
+----==_mimepart_5637c76c38314_3b263fcf84c63bec97427
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2232,7 +2297,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=CyK1Fht_jHJttZwbXsSw" 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/push_type/confirmation?confirmation_token=75vpx6fuqwdrWdfHwuj-" 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>
@@ -2277,49 +2342,49 @@ body {
 </body>
 </html>
 
-----==_mimepart_56379683d7cd0_2a0d3fff7dc57be89696a--
+----==_mimepart_5637c76c38314_3b263fcf84c63bec97427--
 
-   (0.2ms)  RELEASE SAVEPOINT active_record_2
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
 Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"CyK1Fht_jHJttZwbXsSw", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
-  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 1  [["confirmation_token", "CyK1Fht_jHJttZwbXsSw"]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-18@example.com' AND "push_type_users"."id" != '64531310-dadd-446e-ad3f-2071e30feba5') LIMIT 1
+  Parameters: {"user"=>{"confirmation_token"=>"75vpx6fuqwdrWdfHwuj-", "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 1  [["confirmation_token", "75vpx6fuqwdrWdfHwuj-"]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-20@example.com' AND "push_type_users"."id" != '700f03dc-7e3e-4e16-8935-dfaf94314da8') LIMIT 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: 4.8ms | ActiveRecord: 0.4ms)
-   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+Completed 200 OK in 8ms (Views: 5.4ms | 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_0003_anonymous
+PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0002_anonymous
 ------------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  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" = 'joe-19@example.com' LIMIT 1
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-19@example.com' 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 1  [["confirmation_token", "d58b82a4f864c03395dcad3aa4ac41e8adc4e64574ef4843368f13ac25ad018a"]]
-  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-19@example.com"], ["created_at", "2015-11-02 16:59:47.899050"], ["updated_at", "2015-11-02 16:59:47.899050"], ["confirmation_token", "vz5UMsm3ec8WsdMVyrMC"], ["confirmation_sent_at", "2015-11-02 16:59:47.899747"]]
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.2ms)
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."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" = 'joe-21@example.com' 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 1  [["confirmation_token", "fd45579cc9e10690495ce7d90a780bd17e2b8afc3e31dff818c4323fec906da9"]]
+  SQL (0.1ms)  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-21@example.com"], ["created_at", "2015-11-02 20:28:28.246139"], ["updated_at", "2015-11-02 20:28:28.246139"], ["confirmation_token", "PoVPfv_nFrZWCh9JrJAT"], ["confirmation_sent_at", "2015-11-02 20:28:28.246883"]]
+  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.3ms
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.5ms
 
-Sent mail to joe-19@example.com (3.1ms)
-Date: Mon, 02 Nov 2015 16:59:47 +0000
+Sent mail to joe-21@example.com (3.2ms)
+Date: Mon, 02 Nov 2015 20:28:28 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-19@example.com
-Message-ID: <56379683e3171_2a0d3fff7dc57be89732@Aarons-iMac.local.mail>
+To: joe-21@example.com
+Message-ID: <5637c76c43d21_3b263fcf84c63bec978da@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_56379683e2bdb_2a0d3fff7dc57be8972f";
+ boundary="--==_mimepart_5637c76c4375b_3b263fcf84c63bec9777b";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_56379683e2bdb_2a0d3fff7dc57be8972f
+----==_mimepart_5637c76c4375b_3b263fcf84c63bec9777b
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2334,10 +2399,10 @@ created for you.
 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=vz5UMsm3ec8WsdMVyrMC )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=PoVPfv_nFrZWCh9JrJAT )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_56379683e2bdb_2a0d3fff7dc57be8972f
+----==_mimepart_5637c76c4375b_3b263fcf84c63bec9777b
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2383,7 +2448,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=vz5UMsm3ec8WsdMVyrMC" 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/push_type/confirmation?confirmation_token=PoVPfv_nFrZWCh9JrJAT" 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>
@@ -2428,121 +2493,49 @@ body {
 </body>
 </html>
 
-----==_mimepart_56379683e2bdb_2a0d3fff7dc57be8972f--
+----==_mimepart_5637c76c4375b_3b263fcf84c63bec9777b--
 
    (0.1ms)  RELEASE SAVEPOINT active_record_2
 Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"vz5UMsm3ec8WsdMVyrMC", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
-  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 1  [["confirmation_token", "vz5UMsm3ec8WsdMVyrMC"]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-19@example.com' AND "push_type_users"."id" != 'e05082cc-915e-4714-ac0b-eb4d4ff0c064') LIMIT 1
+  Parameters: {"user"=>{"confirmation_token"=>"PoVPfv_nFrZWCh9JrJAT", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
+  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 1  [["confirmation_token", "PoVPfv_nFrZWCh9JrJAT"]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-21@example.com' AND "push_type_users"."id" != 'a3685954-cca3-424e-b9f3-d22a43697b4e') LIMIT 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.3ms | ActiveRecord: 0.4ms)
-   (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.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::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.0ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK
-   (0.1ms)  BEGIN
----------------------------------------------------------------
-PushType::AuthenticatableTest::confirmable: test_0001_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.0ms)  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" = 'joe-20@example.com' LIMIT 1
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-20@example.com' LIMIT 1
-  SQL (0.1ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-20@example.com"], ["confirmation_sent_at", "2015-11-02 16:59:47.949035"], ["confirmed_at", "2015-11-02 16:59:47.949099"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 16:59:47.950635"], ["updated_at", "2015-11-02 16:59:47.950635"]]
-   (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 1  [["id", "aac3c4d8-c707-4eae-9de4-4e8114ce68ee"]]
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin (1.7ms)
-Completed 200 OK in 8ms (Views: 6.8ms | ActiveRecord: 0.1ms)
-   (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.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" = 'joe-21@example.com' LIMIT 1
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-21@example.com' LIMIT 1
-  SQL (0.1ms)  INSERT INTO "push_type_users" ("name", "email", "confirmation_sent_at", "confirmed_at", "confirmation_token", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-21@example.com"], ["confirmation_sent_at", "2015-11-02 16:59:47.961943"], ["confirmed_at", "2015-11-02 16:59:47.961999"], ["confirmation_token", "Generated account"], ["created_at", "2015-11-02 16:59:47.963422"], ["updated_at", "2015-11-02 16:59:47.963422"]]
-   (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 1  [["id", "de462119-10f5-4edf-875f-4625bf3126ee"]]
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/profiles/edit.html.haml within layouts/push_type/admin (1.8ms)
-Completed 200 OK in 8ms (Views: 6.6ms | ActiveRecord: 0.1ms)
+Completed 200 OK in 7ms (Views: 5.0ms | ActiveRecord: 0.4ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  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.0ms)  ROLLBACK
-   (0.0ms)  BEGIN
---------------------------------------------------------------------------------------------------------------
-PushType::AuthenticatableTest::#password_required?::with existing user and dirty password: test_0001_anonymous
---------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0003_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" = 'joe-22@example.com' LIMIT 1
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-22@example.com' 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 1  [["confirmation_token", "1359b6467d0884978efd9841d59c7aea59347bc728a2e93aa432838df6843ab5"]]
-  SQL (0.1ms)  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", "2015-11-02 16:59:47.977265"], ["updated_at", "2015-11-02 16:59:47.977265"], ["confirmation_token", "e5bxG2Jmvx_chNsquZSu"], ["confirmation_sent_at", "2015-11-02 16:59:47.978035"]]
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.2ms)
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = 'joe-22@example.com' 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 1  [["confirmation_token", "6f49c6c1ddb9d45240deda2cf8b3d3adce3d85c0d059db20d0fe43ebadf57bbd"]]
+  SQL (0.1ms)  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", "2015-11-02 20:28:28.291597"], ["updated_at", "2015-11-02 20:28:28.291597"], ["confirmation_token", "aSJEQsv4yhmuAWx1KN9_"], ["confirmation_sent_at", "2015-11-02 20:28:28.292351"]]
+  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.5ms
 
-Sent mail to joe-22@example.com (3.2ms)
-Date: Mon, 02 Nov 2015 16:59:48 +0000
+Sent mail to joe-22@example.com (2.9ms)
+Date: Mon, 02 Nov 2015 20:28:28 +0000
 From: pushtype@example.com
 Reply-To: pushtype@example.com
 To: joe-22@example.com
-Message-ID: <56379684271d_2a0d3fff7dc57be8976c1@Aarons-iMac.local.mail>
+Message-ID: <5637c76c4eeee_3b263fcf84c63bec981d0@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_563796842185_2a0d3fff7dc57be89756a";
+ boundary="--==_mimepart_5637c76c4e9aa_3b263fcf84c63bec980ce";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_563796842185_2a0d3fff7dc57be89756a
+----==_mimepart_5637c76c4e9aa_3b263fcf84c63bec980ce
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2557,10 +2550,10 @@ created for you.
 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=e5bxG2Jmvx_chNsquZSu )
+Confirm my account ( http://localhost:3000/push_type/confirmation?confirmation_token=aSJEQsv4yhmuAWx1KN9_ )
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_563796842185_2a0d3fff7dc57be89756a
+----==_mimepart_5637c76c4e9aa_3b263fcf84c63bec980ce
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2606,7 +2599,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=e5bxG2Jmvx_chNsquZSu" 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/push_type/confirmation?confirmation_token=aSJEQsv4yhmuAWx1KN9_" 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>
@@ -2651,8 +2644,15 @@ body {
 </body>
 </html>
 
-----==_mimepart_563796842185_2a0d3fff7dc57be89756a--
+----==_mimepart_5637c76c4e9aa_3b263fcf84c63bec980ce--
 
    (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::ConfirmationsController#update as HTML
+  Parameters: {"user"=>{"confirmation_token"=>"aSJEQsv4yhmuAWx1KN9_", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
+  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 1  [["confirmation_token", "aSJEQsv4yhmuAWx1KN9_"]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE ("push_type_users"."email" = 'joe-22@example.com' AND "push_type_users"."id" != 'adf21899-be9f-4e4d-9c01-c43b299d0707') LIMIT 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.1ms | ActiveRecord: 0.4ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK