active_admin_editor 1.0.1 → 1.0.3

data/spec/dummy/log/test.log

@@ -2814,3 +2814,190 @@ Completed 200 OK in 42ms (Views: 41.3ms | ActiveRecord: 0.0ms)
    (2.4ms)  DELETE FROM sqlite_sequence where name = 'admin_users';
    (2.4ms)  DELETE FROM "pages";
    (0.1ms)  DELETE FROM sqlite_sequence where name = 'pages';
+Connecting to database specified by database.yml
+   (4.1ms)  DELETE FROM "active_admin_comments";
+   (0.2ms)  DELETE FROM sqlite_sequence where name = 'active_admin_comments';
+   (2.8ms)  DELETE FROM "admin_users";
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'admin_users';
+   (2.5ms)  DELETE FROM "pages";
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'pages';
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (57.1ms)  DELETE FROM "active_admin_comments";
+   (0.3ms)  DELETE FROM sqlite_sequence where name = 'active_admin_comments';
+   (3.4ms)  DELETE FROM "admin_users";
+   (0.2ms)  DELETE FROM sqlite_sequence where name = 'admin_users';
+   (3.0ms)  DELETE FROM "pages";
+   (0.2ms)  DELETE FROM sqlite_sequence where name = 'pages';
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (4.3ms)  DELETE FROM "active_admin_comments";
+   (0.2ms)  DELETE FROM sqlite_sequence where name = 'active_admin_comments';
+   (2.7ms)  DELETE FROM "admin_users";
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'admin_users';
+   (2.5ms)  DELETE FROM "pages";
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'pages';
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (55.6ms)  DELETE FROM "active_admin_comments";
+   (0.3ms)  DELETE FROM sqlite_sequence where name = 'active_admin_comments';
+   (3.4ms)  DELETE FROM "admin_users";
+   (0.7ms)  DELETE FROM sqlite_sequence where name = 'admin_users';
+   (2.9ms)  DELETE FROM "pages";
+   (0.2ms)  DELETE FROM sqlite_sequence where name = 'pages';
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (4.4ms)  DELETE FROM "active_admin_comments";
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'active_admin_comments';
+   (3.0ms)  DELETE FROM "admin_users";
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'admin_users';
+   (2.6ms)  DELETE FROM "pages";
+   (0.2ms)  DELETE FROM sqlite_sequence where name = 'pages';
+   (0.0ms)  begin transaction
+  AdminUser Exists (2.2ms)  SELECT 1 AS one FROM "admin_users" WHERE "admin_users"."email" = 'email1@factory.com' LIMIT 1
+Binary data inserted for `string` type on column `encrypted_password`
+  SQL (21.5ms)  INSERT INTO "admin_users" ("created_at", "current_sign_in_at", "current_sign_in_ip", "email", "encrypted_password", "last_sign_in_at", "last_sign_in_ip", "remember_created_at", "reset_password_sent_at", "reset_password_token", "sign_in_count", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Sat, 29 Dec 2012 11:26:55 UTC +00:00], ["current_sign_in_at", nil], ["current_sign_in_ip", nil], ["email", "email1@factory.com"], ["encrypted_password", "$2a$04$D9J2jOiTe1jWyHtbQVrnnOpt8oImA96GmVxqD7A8YNAegZ9KVokwC"], ["last_sign_in_at", nil], ["last_sign_in_ip", nil], ["remember_created_at", nil], ["reset_password_sent_at", nil], ["reset_password_token", nil], ["sign_in_count", 0], ["updated_at", Sat, 29 Dec 2012 11:26:55 UTC +00:00]]
+   (3.4ms)  commit transaction
+Started GET "/admin/login" for 127.0.0.1 at 2012-12-29 03:26:58 -0800
+Processing by ActiveAdmin::Devise::SessionsController#new as HTML
+  Rendered /Users/ejholmes/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/gems/activeadmin-0.5.1/app/views/active_admin/devise/shared/_links.erb (3.2ms)
+  Rendered /Users/ejholmes/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/gems/activeadmin-0.5.1/app/views/active_admin/devise/sessions/new.html.erb within layouts/active_admin_logged_out (552.0ms)
+Completed 200 OK in 602ms (Views: 600.2ms | ActiveRecord: 0.0ms)
+Started GET "/assets/active_admin.css" for 127.0.0.1 at 2012-12-29 03:26:58 -0800
+Compiled active_admin.css  (1644ms)  (pid 8600)
+Served asset /active_admin.css - 200 OK (1662ms)
+Started GET "/assets/active_admin/editor/wysiwyg.css" for 127.0.0.1 at 2012-12-29 03:27:00 -0800
+Compiled active_admin/editor/wysiwyg.css  (0ms)  (pid 8600)
+Served asset /active_admin/editor/wysiwyg.css - 200 OK (8ms)
+Started GET "/assets/active_admin/editor.css" for 127.0.0.1 at 2012-12-29 03:27:00 -0800
+Compiled active_admin/editor.css  (833ms)  (pid 8600)
+Served asset /active_admin/editor.css - 200 OK (918ms)
+Started GET "/assets/active_admin.js" for 127.0.0.1 at 2012-12-29 03:27:01 -0800
+Compiled jquery.js  (2ms)  (pid 8600)
+Compiled jquery-ui.js  (5ms)  (pid 8600)
+Compiled jquery_ujs.js  (0ms)  (pid 8600)
+Compiled active_admin/lib/namespace.js  (127ms)  (pid 8600)
+Compiled active_admin/components/jquery.aa.checkbox-toggler.js  (139ms)  (pid 8600)
+Compiled active_admin/components/jquery.aa.dropdown-menu.js  (143ms)  (pid 8600)
+Compiled active_admin/components/jquery.aa.popover.js  (140ms)  (pid 8600)
+Compiled active_admin/components/jquery.aa.table-checkbox-toggler.js  (122ms)  (pid 8600)
+Compiled active_admin/pages/application.js  (120ms)  (pid 8600)
+Compiled active_admin/pages/batch_actions.js  (139ms)  (pid 8600)
+Compiled active_admin/application.js  (997ms)  (pid 8600)
+Compiled active_admin/base.js  (1063ms)  (pid 8600)
+Compiled active_admin.js  (1081ms)  (pid 8600)
+Served asset /active_admin.js - 200 OK (1101ms)
+Started GET "/assets/active_admin/editor.js" for 127.0.0.1 at 2012-12-29 03:27:02 -0800
+Compiled wysihtml5.js  (3ms)  (pid 8600)
+Compiled active_admin/editor/templates/toolbar.js  (0ms)  (pid 8600)
+Compiled active_admin/editor/templates/uploader.js  (0ms)  (pid 8600)
+Compiled active_admin/editor/editor.js  (22ms)  (pid 8600)
+Compiled active_admin/editor/config.js  (2ms)  (pid 8600)
+Compiled active_admin/editor/parser_rules.js  (0ms)  (pid 8600)
+Compiled active_admin/editor.js  (95ms)  (pid 8600)
+Served asset /active_admin/editor.js - 200 OK (151ms)
+Started GET "/assets/active_admin/print.css" for 127.0.0.1 at 2012-12-29 03:27:02 -0800
+Compiled active_admin/print.css  (193ms)  (pid 8600)
+Served asset /active_admin/print.css - 200 OK (237ms)
+   (8.6ms)  DELETE FROM "active_admin_comments";
+   (0.2ms)  DELETE FROM sqlite_sequence where name = 'active_admin_comments';
+   (5.4ms)  DELETE FROM "admin_users";
+   (4.9ms)  DELETE FROM sqlite_sequence where name = 'admin_users';
+   (5.8ms)  DELETE FROM "pages";
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'pages';
+   (0.1ms)  begin transaction
+  AdminUser Exists (0.2ms)  SELECT 1 AS one FROM "admin_users" WHERE "admin_users"."email" = 'email2@factory.com' LIMIT 1
+Binary data inserted for `string` type on column `encrypted_password`
+  SQL (0.7ms)  INSERT INTO "admin_users" ("created_at", "current_sign_in_at", "current_sign_in_ip", "email", "encrypted_password", "last_sign_in_at", "last_sign_in_ip", "remember_created_at", "reset_password_sent_at", "reset_password_token", "sign_in_count", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Sat, 29 Dec 2012 11:27:05 UTC +00:00], ["current_sign_in_at", nil], ["current_sign_in_ip", nil], ["email", "email2@factory.com"], ["encrypted_password", "$2a$04$Ud2Lb3Jz5K4CFG8w56D39urldDtjARQWTEiXbomQ7T4aRRwQmXqIi"], ["last_sign_in_at", nil], ["last_sign_in_ip", nil], ["remember_created_at", nil], ["reset_password_sent_at", nil], ["reset_password_token", nil], ["sign_in_count", 0], ["updated_at", Sat, 29 Dec 2012 11:27:05 UTC +00:00]]
+   (3.0ms)  commit transaction
+Started GET "/admin/login" for 127.0.0.1 at 2012-12-29 03:27:05 -0800
+Processing by ActiveAdmin::Devise::SessionsController#new as HTML
+  Rendered /Users/ejholmes/.rbenv/versions/1.9.3-p327/lib/ruby/gems/1.9.1/gems/activeadmin-0.5.1/app/views/active_admin/devise/shared/_links.erb (0.6ms)
+Completed 200 OK in 23ms (Views: 22.4ms | ActiveRecord: 0.0ms)
+Started GET "/assets/active_admin.css" for 127.0.0.1 at 2012-12-29 03:27:05 -0800
+Served asset /active_admin.css - 200 OK (7ms)
+Started GET "/assets/active_admin/editor.css" for 127.0.0.1 at 2012-12-29 03:27:05 -0800
+Served asset /active_admin/editor.css - 200 OK (4ms)
+Started GET "/assets/active_admin/editor/wysiwyg.css" for 127.0.0.1 at 2012-12-29 03:27:05 -0800
+Served asset /active_admin/editor/wysiwyg.css - 200 OK (0ms)
+Started GET "/assets/active_admin/editor.js" for 127.0.0.1 at 2012-12-29 03:27:05 -0800
+Served asset /active_admin/editor.js - 200 OK (0ms)
+Started GET "/assets/active_admin.js" for 127.0.0.1 at 2012-12-29 03:27:05 -0800
+Served asset /active_admin.js - 200 OK (1ms)
+Started GET "/assets/active_admin/print.css" for 127.0.0.1 at 2012-12-29 03:27:05 -0800
+Served asset /active_admin/print.css - 200 OK (0ms)
+Started POST "/admin/login" for 127.0.0.1 at 2012-12-29 03:27:05 -0800
+Processing by ActiveAdmin::Devise::SessionsController#create as HTML
+  Parameters: {"utf8"=>"✓", "admin_user"=>{"email"=>"email2@factory.com", "password"=>"[FILTERED]", "remember_me"=>"0"}, "commit"=>"Login"}
+  AdminUser Load (0.1ms)  SELECT "admin_users".* FROM "admin_users" WHERE "admin_users"."email" = 'email2@factory.com' LIMIT 1
+   (0.0ms)  begin transaction
+   (0.3ms)  UPDATE "admin_users" SET "last_sign_in_at" = '2012-12-29 11:27:05.509600', "current_sign_in_at" = '2012-12-29 11:27:05.509600', "last_sign_in_ip" = '127.0.0.1', "current_sign_in_ip" = '127.0.0.1', "sign_in_count" = 1, "updated_at" = '2012-12-29 11:27:05.510394' WHERE "admin_users"."id" = 1
+   (2.7ms)  commit transaction
+Redirected to http://127.0.0.1:58432/admin
+Completed 302 Found in 32ms (ActiveRecord: 0.0ms)
+Started GET "/admin" for 127.0.0.1 at 2012-12-29 03:27:05 -0800
+Processing by Admin::DashboardController#index as HTML
+  AdminUser Load (0.2ms)  SELECT "admin_users".* FROM "admin_users" WHERE "admin_users"."id" = 1 LIMIT 1
+Completed 200 OK in 49ms (Views: 46.4ms | ActiveRecord: 0.2ms)
+Started GET "/admin/pages/new" for 127.0.0.1 at 2012-12-29 03:27:05 -0800
+Processing by Admin::PagesController#new as HTML
+  AdminUser Load (0.2ms)  SELECT "admin_users".* FROM "admin_users" WHERE "admin_users"."id" = 1 LIMIT 1
+Completed 200 OK in 57ms (Views: 48.7ms | ActiveRecord: 0.2ms)
+   (4.1ms)  DELETE FROM "active_admin_comments";
+   (0.2ms)  DELETE FROM sqlite_sequence where name = 'active_admin_comments';
+   (2.6ms)  DELETE FROM "admin_users";
+   (2.8ms)  DELETE FROM sqlite_sequence where name = 'admin_users';
+   (2.9ms)  DELETE FROM "pages";
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'pages';
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction

data/spec/javascripts/editor_spec.js

@@ -81,10 +81,6 @@ describe('Editor', function() {
       this.xhr.prototype.upload = { addEventListener: sinon.stub() }
     })
 
-    it('returns an XMLHttpRequest', function() {
-      expect(this.editor.upload(sinon.stub(), function() {})).to.be(XMLHttpRequest)
-    })
-
     it('opens the connection to the proper bucket', function() {
       this.xhr.prototype.open = sinon.stub()
       this.xhr.prototype.send = sinon.stub()
@@ -99,6 +95,36 @@ describe('Editor', function() {
       expect(xhr.send).to.have.been.called
     })
 
+    describe('when the upload succeeds', function() {
+      it('calls the callback with the location', function(done) {
+        this.xhr.prototype.open = sinon.stub()
+        this.xhr.prototype.send = sinon.stub()
+        this.config.s3_bucket = 'bucket'
+        xhr = this.editor.upload(sinon.stub(), function(location) {
+          expect(location).to.eq('foo')
+          done()
+        })
+        xhr.getResponseHeader = sinon.stub().returns('foo')
+        xhr.readyState = 4
+        xhr.status = 204
+        xhr.onreadystatechange()
+      })
+    })
+
+    describe('when the upload fails', function() {
+      it('shows an alert', function() {
+        this.xhr.prototype.open = sinon.stub()
+        this.xhr.prototype.send = sinon.stub()
+        this.config.s3_bucket = 'bucket'
+        alert = sinon.stub()
+        xhr = this.editor.upload(sinon.stub(), function() {})
+        xhr.readyState = 4
+        xhr.status = 403
+        xhr.onreadystatechange()
+        expect(alert).to.have.been.calledWith('Failed to upload file. Have you configured S3 properly?')
+      })
+    })
+
     describe('form data', function() {
       beforeEach(function() {
         file = this.file = { name: 'foobar', type: 'image/jpg' }