Specs for API and channels

* Adds spec for API controller and fixes channels controller spec

* Changes FactoryGirl definitions

app/controllers/apis_controller.rb

@@ -4,7 +4,7 @@ class ApisController < ApplicationController
 
   def active_users
     respond_to do |format|
-      format.js { render :json => ActiveUsers.all }
+      format.json { render :json => ActiveUsers.all }
     end
   end
 end

spec/controllers/apis_controller_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe ApisController do
+
+  before :each do
+    @user = Factory :user
+    request.env['warden'].stub :authenticate! => @user
+    controller.stub :current_user => @user
+  end
+
+
+  describe "active_users" do
+    it "should return json" do
+      get :active_users, :format => :json
+      ActiveUsers.stub!(:all).and_return([])
+      JSON(response.body).should be_kind_of(Array)
+    end
+  end
+end

spec/controllers/channels_controller_spec.rb

@@ -4,20 +4,23 @@
 
   before :all do
     @channel = Factory :channel
-    # @sample_activity = @channel.activities.build :action => "message"
   end
 
   before :each do
     @user = Factory :user
     request.env['warden'].stub :authenticate! => @user
     controller.stub :current_user => @user
   end
-  
+
   describe "GET index" do
     it "should return list of channels in JSON" do
       get :index, :format => :json
-      JSON(response.body).should be_kind_of(Array)
-      JSON(response.body).first.should have_key("activities")
+      JSON(response.body) # parse to validate json
+    end
+
+    it "should have an array for activities in the JSON response" do
+      get :index, :format => :json
+      puts JSON(response.body).first["activities"].should be_kind_of(Array)
     end
   end
 

spec/factories.rb

@@ -1,18 +1,20 @@
-Factory.sequence :ido_id do |n|
-  "abc-#{ n }"
-end
+FactoryGirl.define do
+  sequence :ido_id do |n|
+    "abc-#{n}"
+  end
 
-Factory.sequence :email do |n|
-  "email#{ n }@factory.com"
-end
+  sequence :email do |n|
+    "email#{n}@example.com"
+  end
 
-Factory.define :channel do |f|
-  f.name "Test channel"
-end
+  factory :channel do |f|
+    f.name "Test channel"
+  end
 
-Factory.define :user do |f|
-  f.first_name "Test"
-  f.last_name  "User"
-  f.email  { Factory.next(:email) }
-  f.ido_id { Factory.next(:ido_id) }
-end
+  factory :user do |f|
+    f.first_name "Test"
+    f.last_name  "User"
+    f.email  { Factory.next(:email) }
+    f.ido_id { Factory.next(:ido_id) }
+  end
+end

spec/spec_helper.rb

@@ -1,8 +1,9 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
+ENV["RAILS_ENV"] = 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
+require "#{Rails.root}/lib/active_users.rb"
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.