diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb
index 466b8fca763ca97f07f1b9204d4c9302f4ad452f..5ab1da2ae7a9627ea961f39b4b27c674978a9063 100644
--- a/spec/controllers/status_messages_controller_spec.rb
+++ b/spec/controllers/status_messages_controller_spec.rb
@@ -16,9 +16,35 @@ describe StatusMessagesController do
end
describe '#bookmarklet' do
+ def pass_test_args(text='cute kitty')
+ get :bookmarklet, {:url => 'https://www.youtube.com/watch?v=0Bmhjf0rKe8',
+ :title => 'Surprised Kitty',
+ :notes => text}
+ end
+
it 'succeeds' do
get :bookmarklet
response.should be_success
+
+ #TODO replace response.body with html_for('body') as soon as there is a <body>
+ save_fixture(response.body, 'empty_bookmarklet')
+ end
+
+ it 'accepts get params' do
+ pass_test_args
+ response.should be_success
+
+ #TODO replace response.body with html_for('body') as soon as there is a <body>
+ save_fixture(response.body, 'prefilled_bookmarklet')
+ end
+
+ it 'correctly deals with dirty input' do
+ test_text = "**love** This is such a\n\n great \"cute kitty\" '''blabla'''"
+ pass_test_args(test_text)
+ response.should be_success
+
+ #TODO replace response.body with html_for('body') as soon as there is a <body>
+ save_fixture(response.body, 'prefilled_bookmarklet_dirty')
end
end
diff --git a/spec/javascripts/bookmarklet-spec.js b/spec/javascripts/bookmarklet-spec.js
new file mode 100644
index 0000000000000000000000000000000000000000..96f5c6da3c9fae9631d081814876bb0992b170d8
--- /dev/null
+++ b/spec/javascripts/bookmarklet-spec.js
@@ -0,0 +1,39 @@
+/* Copyright (c) 2010-2012, Diaspora Inc. This file is
+* licensed under the Affero General Public License version 3 or later. See
+* the COPYRIGHT file.
+*/
+
+describe("bookmarklet", function() {
+
+ describe("base functionality", function(){
+ beforeEach( function(){
+ spec.loadFixture('empty_bookmarklet');
+ });
+
+ it('verifies the publisher is loaded', function(){
+ expect(typeof Publisher === "object").toBeTruthy();
+ });
+
+ it('verifies we are using the bookmarklet', function(){
+ expect(Publisher.bookmarklet).toBeTruthy();
+ });
+ });
+
+ describe("prefilled bookmarklet", function(){
+ it('fills in some text into the publisher', function(){
+ spec.loadFixture('prefilled_bookmarklet');
+ expect($("#publisher #status_message_fake_text").val() == "").toBeFalsy();
+ expect($("#publisher #status_message_text").val() == "").toBeFalsy();
+ });
+
+ it('handles dirty input well', function(){
+ spec.loadFixture('prefilled_bookmarklet_dirty');
+ expect($("#publisher #status_message_fake_text").val() == "").toBeFalsy();
+ expect($("#publisher #status_message_text").val() == "").toBeFalsy();
+ });
+ });
+
+
+
+
+});
\ No newline at end of file