Permalink
Browse files

Updated

  • Loading branch information...
1 parent 58c9b2d commit 69a6896b8edbe8826c1ff25026e22ca51697bf9e @baphled committed Apr 28, 2011
@@ -3,7 +3,27 @@
<head>
<title>Dummy</title>
<%= stylesheet_link_tag :all %>
- <%= javascript_include_tag :defaults %>
+ <%= javascript_include_tag :defaults, 'jquery.cssemoticons.min' %>
+
+ <script src="http://js.pusherapp.com/1.8/pusher.min.js" type="text/javascript"></script>
+ <script type="text/javascript">
+
+ var pusher = new Pusher('1760cc2007fea206f2df');
+ var channel = pusher.subscribe('messages');
+ channel.bind('new-message', function(data) {
+ $new_message = $('<li>').append(data['from'] + ": " + data['body']);
+ $('ul.messages').prepend($new_message);
+ });
+ </script>
+ <script type="text/javascript" charset="utf-8">
+ $(document).ready(function() {
+ $("#new_chat_engine_message")
+ .bind("ajax:success", function(event, data, status, xhr) {
+ $('ul').emoticonize();
+ $("input#chat_engine_message_body").attr('value','');
+ });
+ });
+ </script>
<%= csrf_meta_tag %>
</head>
<body>
@@ -1,2 +1,2 @@
// Place your application-specific JavaScript functions and classes here
-// This file is automatically included by javascript_include_tag :defaults
+// This file is automatically included by javascript_include_tag :defaults
@@ -1,5 +1,8 @@
require 'spec_helper'
+def sign_in
+
+end
describe "Navigation" do
include Capybara
@@ -25,7 +28,7 @@
page.should have_content "foobar: my comment"
end
- it "allows me to view the messages on in the chat"
+ it "displays a list of signed in users"
it "can select a message color"
it "can send out invitations to join"
end
View
@@ -3,7 +3,7 @@
require File.expand_path("../dummy/config/environment.rb", __FILE__)
require "rspec/rails"
-require 'timecop'
+require 'faker'
ActionMailer::Base.delivery_method = :test
ActionMailer::Base.perform_deliveries = true

0 comments on commit 69a6896

Please sign in to comment.