bigbluebutton_rails 1.0.0 → 1.1.0

data/app/views/bigbluebutton/rooms/edit.html.erb

@@ -1,6 +1,6 @@
 <h1>Edit <%= BigbluebuttonRoom.model_name.human %>:</h1>
 <%= render 'form' %>
 
-<%= link_to 'Show', bigbluebutton_server_room_path(@server, @room) %> |
-<%= link_to 'Back', bigbluebutton_server_rooms_path %>
+<%= link_to 'Show', bigbluebutton_room_path(@room) %> |
+<%= link_to 'Back', bigbluebutton_rooms_path %>
 

data/app/views/bigbluebutton/rooms/external.html.erb

@@ -4,7 +4,8 @@
 
 <p>This meeting was created from another application.<br/>You must provide a name and a password to join:</p>
 
-<%= form_tag external_bigbluebutton_server_rooms_path(@server) do %>
+<%= form_tag external_bigbluebutton_rooms_path do %>
+  <%= hidden_field_tag "server_id", params[:server_id] %>
   <%= hidden_field_tag "meeting", params[:meeting] %>
 
   <div class="field">

data/app/views/bigbluebutton/rooms/index.html.erb

@@ -1,37 +1,2 @@
-<h1>Listing <%= BigbluebuttonRoom.model_name.human %>:</h1>
-
-<div id="bbbrails_rooms_links">
-  <%= link_to 'Back to server', bigbluebutton_server_path(@server) %> |
-  <%= link_to 'Back to server list', bigbluebutton_servers_path %><br/>
-  <%= link_to 'New room', new_bigbluebutton_server_room_path %>
-</div>
-
-<ul id="bbbrails_rooms_list">
-  <% @rooms.each do |room| %>
-    <li>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:server_id) %></label> <%= room.server_id %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:meetingid) %></label> <%= room.meetingid %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:randomize_meetingid) %></label> <%= room.randomize_meetingid %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:name) %></label> <%= room.name %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:private) %></label> <%= room.private %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:attendee_password) %></label> <%= room.attendee_password %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:moderator_password) %></label> <%= room.moderator_password %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:welcome_msg) %></label> <%= room.welcome_msg %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:logout_url) %></label> <%= room.logout_url %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:dial_number) %></label> <%= room.dial_number %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:voice_bridge) %></label> <%= room.voice_bridge %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:max_participants) %></label> <%= room.max_participants %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:external) %></label> <%= room.external %></div>
-      <div class="field"><label><%= BigbluebuttonRoom.human_attribute_name(:param) %></label> <%= room.param %></div>
-      <div class="field"><label>Access</label>
-        <%= link_to 'Show', bigbluebutton_server_room_path(@server, room) %> |
-        <%= link_to 'Join', join_bigbluebutton_server_room_path(@server, room) %> |
-        <%= link_to 'Invite', invite_bigbluebutton_server_room_path(@server, room) %> |
-        <%= link_to 'Mobile Join', join_mobile_bigbluebutton_server_room_path(@server, room) %> |
-        <%= link_to 'Edit', edit_bigbluebutton_server_room_path(@server, room) %> |
-        <%= link_to 'End', end_bigbluebutton_server_room_path(@server, room), :confirm => 'Are you sure?' %> |
-        <%= link_to 'Destroy', bigbluebutton_server_room_path(@server, room), :confirm => 'Are you sure?', :method => :delete %>
-      </div>
-    </li>
-  <% end %>
-</ul>
+<h1>Listing rooms:</h1>
+<%= render 'rooms' %>

data/app/views/bigbluebutton/rooms/invite.html.erb

@@ -2,7 +2,7 @@
 
 function ajax_request() {
   $.ajax({
-    url: "<%= running_bigbluebutton_server_room_url(@server, @room, :format => 'json') %>",
+    url: "<%= running_bigbluebutton_room_url(@room, :format => 'json') %>",
     dataType: 'json',
     error: function(xhr_data) {
       $("#meeting_status").html("<request error>.");
@@ -33,7 +33,7 @@ $(document).ready(function(){
 <p>Meeting status: <span id="meeting_status">-</span> (<a href="javascript:ajax_request();">refresh</a>)</p>
 <p><%= @room.name %> requires a name and/or password to join:</p>
 
-<%= form_tag join_bigbluebutton_server_room_path(@server, @room) do %>
+<%= form_tag join_bigbluebutton_room_path(@room) do %>
 
   <div class="field">
     <label for="user_name">Name:</label><br />

data/app/views/bigbluebutton/rooms/join.html.erb

@@ -2,7 +2,7 @@
 
 function ajax_request() {
   $.ajax({
-    url: "<%= running_bigbluebutton_server_room_url(@server, @room, :format => 'json') %>",
+    url: "<%= running_bigbluebutton_room_url(@room, :format => 'json') %>",
     dataType: 'json',
     error: function(xhr_data) {
       //

data/app/views/bigbluebutton/rooms/new.html.erb

@@ -2,4 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Back', bigbluebutton_server_rooms_path %>
+<%= link_to 'Back', bigbluebutton_rooms_path %>

data/app/views/bigbluebutton/rooms/show.html.erb

@@ -8,7 +8,7 @@
 </p>
 <p>
   <b><%= BigbluebuttonRoom.human_attribute_name(:server_id) %>:</b>
-  <%= @room.server.id %>
+  <%= @room.server_id %>
 </p>
 <p>
   <b><%= BigbluebuttonRoom.human_attribute_name(:meetingid) %>:</b>
@@ -59,9 +59,15 @@
   <%= @room.param %>
 </p>
 
-<%= link_to 'Edit', edit_bigbluebutton_server_room_path(@room.server, @room) %> |
-<%= link_to 'Back', bigbluebutton_server_rooms_path(@room.server) %>
+<%= link_to 'Edit', edit_bigbluebutton_room_path(@room) %> |
+<%= link_to 'Back', bigbluebutton_rooms_path %>
 
 <br/>
 
-<%= link_to 'Join', join_bigbluebutton_server_room_path(@room.server, @room) %>
+<span>Access:</span>
+<%= link_to 'Show', bigbluebutton_room_path(@room) %> |
+<%= link_to 'Join', join_bigbluebutton_room_path(@room) %> |
+<%= link_to 'Invite', invite_bigbluebutton_room_path(@room) %> |
+<%= link_to 'Mobile Join', join_mobile_bigbluebutton_room_path(@room) %> |
+<%= link_to 'End', end_bigbluebutton_room_path(@room), :confirm => 'Are you sure?' %> |
+<%= link_to 'Destroy', bigbluebutton_room_path(@room), :confirm => 'Are you sure?', :method => :delete %>

data/app/views/bigbluebutton/servers/_activity_list.html.erb

@@ -3,14 +3,14 @@
     <div class="title_bar">
       <% unless room.new_record? %>
         <div class="button_bar">
-          <%= link_to 'Show', bigbluebutton_server_room_path(server, room) %>
-          <%= link_to 'Edit', edit_bigbluebutton_server_room_path(server, room) %>
-          <%= link_to 'Destroy', bigbluebutton_server_room_path(server, room), :confirm => 'Are you sure?', :method => :delete %>
+          <%= link_to 'Show', bigbluebutton_room_path(room) %>
+          <%= link_to 'Edit', edit_bigbluebutton_room_path(room) %>
+          <%= link_to 'Destroy', bigbluebutton_room_path(room), :confirm => 'Are you sure?', :method => :delete %>
         </div>
         <div class="button_bar">
-          <%= link_to 'Join', join_bigbluebutton_server_room_path(server, room) %>
-          <%= link_to 'Mobile Join', join_mobile_bigbluebutton_server_room_path(server, room) %>
-          <%= link_to 'End', end_bigbluebutton_server_room_path(server, room), :confirm => 'Are you sure?' %>
+          <%= link_to 'Join', join_bigbluebutton_room_path(room) %>
+          <%= link_to 'Mobile Join', join_mobile_bigbluebutton_room_path(room) %>
+          <%= link_to 'End', end_bigbluebutton_room_path(room), :confirm => 'Are you sure?' %>
         </div>
       <% end %>
       <b><%= room.name %></b> (ID: <%= room.meetingid %>) -

data/app/views/bigbluebutton/servers/index.html.erb

@@ -1,7 +1,8 @@
 <h1>Listing <%= BigbluebuttonServer.model_name.human %>:</h1>
 
 <div id="bbbrails_servers_links">
-  <%= link_to 'New server', new_bigbluebutton_server_path %>
+  <%= link_to('View rooms list', bigbluebutton_rooms_path) %><br/>
+  <%= link_to('New server', new_bigbluebutton_server_path) %>
 </div>
 
 <ul id="bbbrails_servers_list">
@@ -14,10 +15,10 @@
       <div><label><%= BigbluebuttonServer.human_attribute_name(:param) %></label> <%= server.param %></div>
       <div><label>Access</label>
         <%= link_to 'Show', server %> |
-        <%= link_to 'View rooms', bigbluebutton_server_rooms_path(server) %> |
+        <%= link_to 'View rooms', rooms_bigbluebutton_server_path(server) %> |
         <%= link_to 'Activity monitor', activity_bigbluebutton_server_path(server) %> |
         <%= link_to 'Edit', edit_bigbluebutton_server_path(server) %> |
-        <%= link_to 'Destroy', server, :confirm => 'Are you sure?', :method => :delete %>
+        <%= link_to 'Destroy', bigbluebutton_server_path(server), :confirm => 'Are you sure?', :method => :delete %>
       </div>
     </li>
   <% end %>

data/app/views/bigbluebutton/servers/rooms.html.erb

@@ -0,0 +1,2 @@
+<h1>Listing rooms for the server <%= @server.name %>:</h1>
+<%= render 'bigbluebutton/rooms/rooms' %>

data/app/views/bigbluebutton/servers/show.html.erb

@@ -29,8 +29,7 @@
 
 
 <%= link_to 'Edit', edit_bigbluebutton_server_path(@server) %> |
+<%= link_to 'View rooms', rooms_bigbluebutton_server_path(@server) %> |
+<%= link_to 'Activity monitor', activity_bigbluebutton_server_path(@server) %> |
+<%= link_to 'Destroy', bigbluebutton_server_path(@server), :confirm => 'Are you sure?', :method => :delete %> |
 <%= link_to 'Back', bigbluebutton_servers_path %>
-
-<br/>
-
-<%= link_to 'New room', new_bigbluebutton_server_room_path(@server) %>

data/config/locales/en.yml

@@ -27,10 +27,14 @@ en:
         auth:
           failure: "Authentication failure."
           not_running: "The meeting is not running. You must wait for a moderator to join."
-          wrong_params: "Wrong params in your request."
+          wrong_params: "Wrong parameters in your request."
         external:
-          blank_meetingid: "You must specify the meetingid of the meeting you want to join"
-        param_format: 'you can only use letters, numbers and the symbols "-" or "_" (not at the begin or end)'
+          blank_meetingid: "You must specify the meetingid of the meeting you want to join."
+          inexistent_meeting: "The meeting informed does not exists in the server."
+          wrong_params: "Wrong parameters in your request."
+        param_format: 'you can only use letters, numbers and the symbols "-" or "_" (not at the begin or end).'
+        server:
+          not_set: "Your room must be associated to a server to execute this operation."
 
   activerecord:
     models:

data/lib/bigbluebutton_rails/exceptions.rb

@@ -3,4 +3,8 @@ module BigbluebuttonRails
   # Raised when the user is not authorized to join a room
   class RoomAccessDenied < StandardError; end
 
+  # Raised when an action that requires a server is called for a
+  # room that does not have a server associated
+  class ServerRequired < StandardError; end
+
 end

data/lib/bigbluebutton_rails/rails/routes.rb

@@ -13,23 +13,23 @@ module ActionDispatch::Routing
     #
     # Passing the option :default, it will generate the default routes to access
     # bigbluebutton servers and rooms. These routes are the resourceful routes generated
-    # by rails to a resource, plus two new actions for the rooms.
+    # by rails to a resource, plus the other available actions for servers and rooms.
     #
     #    bigbluebutton_routes :default
     #
-    # Some routes generated:
+    # Examples of some routes generated:
     #
     #   bigbluebutton_server               GET    /bigbluebutton/servers/:id(.:format)
     #                                             { :action=>"show", :controller=>"bigbluebutton/servers" }
     #                                      POST   /bigbluebutton/servers/:id(.:format)
     #                                             { :action=>"update", :controller=>"bigbluebutton/servers" }
-    #   join_bigbluebutton_server_room     GET    /bigbluebutton/servers/:server_id/rooms/:id/join(.:format)
+    #   join_bigbluebutton_room            GET    /bigbluebutton/rooms/:id/join(.:format)
     #                                             { :action=>"join", :controller=>"bigbluebutton/rooms" }
-    #   running_bigbluebutton_server_room  GET    /bigbluebutton/servers/:server_id/rooms/:id/running(.:format)
+    #   running_bigbluebutton_room         GET    /bigbluebutton/rooms/:id/running(.:format)
     #                                             { :action=>"running", :controller=>"bigbluebutton/rooms" }
     #
     # The routes point by default to the controllers Bigbluebutton::ServersController and Bigbluebutton::RoomsController
-    # and the the routes are scoped (namespaced) with 'bigbluebutton'. You can change the namespace with:
+    # and they are scoped (namespaced) with 'bigbluebutton'. You can change the namespace with:
     #
     #    bigbluebutton_routes :default, :scope => "webconference"
     #
@@ -40,7 +40,8 @@ module ActionDispatch::Routing
     # ==== Room matchers
     #
     # Generates matchers to access a room from a different url or inside another resource.
-    # It creates routes to the actions #show, #join, #running, #end, #invite, and #auth.
+    # Rooms can belong to users, communities or any other type of "entity" in an aplication.
+    # This helper creates routes to the all the actions available in Bigbluebutton::RoomsController.
     #
     #    bigbluebutton_routes :room_matchers
     #
@@ -50,18 +51,12 @@ module ActionDispatch::Routing
     #     bigbluebutton_routes :room_matchers
     #   end
     #
-    # The routes generated are:
+    # Examples of some routes generated:
     #
     #   user_room               GET  /users/:user_id/room/:id(.:format)
     #                                { :controller=>"bigbluebutton/rooms", :action=>"show" }
     #   user_join_room          GET  /users/:user_id/room/:id/join(.:format)
     #                                { :controller=>"bigbluebutton/rooms", :action=>"join" }
-    #   user_join_mobile_room   GET  /users/:user_id/room/:id/invite(.:format)
-    #                                { :controller=>"bigbluebutton/rooms", :action=>"invite" }
-    #   user_auth_room          POST /users/:user_id/room/:id/join(.:format)
-    #                                { :controller=>"bigbluebutton/rooms", :action=>"auth" }
-    #   user_running_room       GET  /users/:user_id/room/:id/running(.:format)
-    #                                { :controller=>"bigbluebutton/rooms", :action=>"running" }
     #   user_end_room           GET  /users/:user_id/room/:id/end(.:format)
     #                                { :controller=>"bigbluebutton/rooms", :action=>"end" }
     #   user_invite_room        GET  /users/:user_id/room/:id/invite(.:format)
@@ -82,33 +77,31 @@ module ActionDispatch::Routing
       scope options_scope, :as => options_scope do
         resources :servers, :controller => BigbluebuttonRails.controllers[:servers] do
           get :activity, :on => :member
-          resources :rooms, :controller => BigbluebuttonRails.controllers[:rooms] do
-            collection do
-              get :external
-              post :external, :action => :external_auth
-            end
-            member do
-              get :join
-              get :running
-              get :end
-              get :invite
-              get :join_mobile
-              post :join, :action => :auth
-            end
-          end
+          get :rooms, :on => :member
         end
+        add_routes_for_rooms
       end
     end
 
     def bigbluebutton_routes_room_matchers(*params) #:nodoc:
-      # TODO This is generating helpers like "user_running_room" instead of "running_user_room"
-      get 'room/:id' => "#{BigbluebuttonRails.controllers[:rooms]}#show", :as => 'room'
-      get 'room/:id/join' => "#{BigbluebuttonRails.controllers[:rooms]}#join", :as => 'join_room'
-      get 'room/:id/join_mobile' => "#{BigbluebuttonRails.controllers[:rooms]}#join_mobile", :as => 'join_mobile_room'
-      post 'room/:id/join' => "#{BigbluebuttonRails.controllers[:rooms]}#auth", :as => 'join_room'
-      get 'room/:id/running' => "#{BigbluebuttonRails.controllers[:rooms]}#running", :as => 'running_room'
-      get 'room/:id/end' => "#{BigbluebuttonRails.controllers[:rooms]}#end", :as => 'end_room'
-      get 'room/:id/invite' => "#{BigbluebuttonRails.controllers[:rooms]}#invite", :as => 'invite_room'
+      add_routes_for_rooms
+    end
+
+    def add_routes_for_rooms
+      resources :rooms, :controller => BigbluebuttonRails.controllers[:rooms] do
+        collection do
+          get :external
+          post :external, :action => :external_auth
+        end
+        member do
+          get :join
+          get :running
+          get :end
+          get :invite
+          get :join_mobile
+          post :join, :action => :auth
+        end
+      end
     end
 
   end

data/lib/bigbluebutton_rails/version.rb

@@ -1,3 +1,3 @@
 module BigbluebuttonRails
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.0".freeze
 end

data/spec/controllers/bigbluebutton/rooms_controller_exception_handling_spec.rb

@@ -2,14 +2,13 @@ require 'spec_helper'
 
 describe Bigbluebutton::RoomsController do
   render_views
-  let(:server) { Factory.create(:bigbluebutton_server) }
-  let(:room) { Factory.create(:bigbluebutton_room, :server => server) }
 
   # make sure that the exceptions thrown by bigbluebutton-api-ruby are treated by the controller
   context "exception handling" do
     let(:bbb_error_msg) { "err msg" }
     let(:bbb_error) { BigBlueButton::BigBlueButtonException.new(bbb_error_msg) }
     let(:http_referer) { bigbluebutton_server_path(mocked_server) }
+    let(:room) { Factory.create(:bigbluebutton_room, :server => mocked_server) }
     before {
       mock_server_and_api
       request.env["HTTP_REFERER"] = http_referer
@@ -26,16 +25,16 @@ describe Bigbluebutton::RoomsController do
       end
 
       after :each do
-        delete :destroy, :server_id => mocked_server.to_param, :id => room.to_param
+        delete :destroy, :id => room.to_param
         should respond_with(:redirect)
-        should redirect_to bigbluebutton_server_rooms_url
+        should redirect_to bigbluebutton_rooms_url
         should set_the_flash.to(bbb_error_msg)
       end
     end
 
     describe "#running" do
       before { mocked_api.should_receive(:is_meeting_running?) { raise bbb_error } }
-      before(:each) { get :running, :server_id => mocked_server.to_param, :id => room.to_param }
+      before(:each) { get :running, :id => room.to_param }
       it { should respond_with(:success) }
       it { response.body.should == build_running_json(false, bbb_error_msg) }
       it { should set_the_flash.to(bbb_error_msg) }
@@ -52,7 +51,7 @@ describe Bigbluebutton::RoomsController do
       end
 
       after :each do
-        get :end, :server_id => mocked_server.to_param, :id => room.to_param
+        get :end, :id => room.to_param
         should respond_with(:redirect)
         should redirect_to(http_referer)
         should set_the_flash.to(bbb_error_msg)
@@ -63,7 +62,11 @@ describe Bigbluebutton::RoomsController do
       before { controller.stub(:bigbluebutton_user) { Factory.build(:user) } }
 
       context "as moderator" do
-        before { controller.should_receive(:bigbluebutton_role).with(room).and_return(:moderator) }
+        before {
+          controller.should_receive(:bigbluebutton_role).with(room).and_return(:moderator)
+          room.stub(:select_server).and_return(mocked_server)
+          BigbluebuttonRoom.stub(:find_by_param).and_return(room)
+        }
 
         it "catches exception on is_meeting_running" do
           mocked_api.should_receive(:is_meeting_running?) { raise bbb_error }
@@ -80,7 +83,7 @@ describe Bigbluebutton::RoomsController do
         end
 
         after :each do
-          get :join, :server_id => mocked_server.to_param, :id => room.to_param
+          get :join, :id => room.to_param
           should respond_with(:redirect)
           should redirect_to(http_referer)
           should set_the_flash.to(bbb_error_msg)
@@ -88,7 +91,7 @@ describe Bigbluebutton::RoomsController do
 
       end
 
-      context "as moderator" do
+      context "as attendee" do
         before { controller.should_receive(:bigbluebutton_role).with(room).and_return(:attendee) }
 
         it "catches exception on is_meeting_running" do
@@ -101,7 +104,7 @@ describe Bigbluebutton::RoomsController do
         end
 
         after :each do
-          get :join, :server_id => mocked_server.to_param, :id => room.to_param
+          get :join, :id => room.to_param
           should respond_with(:redirect)
           should redirect_to(http_referer)
           should set_the_flash.to(bbb_error_msg)

data/spec/controllers/bigbluebutton/rooms_controller_json_responses_spec.rb

@@ -5,21 +5,21 @@ describe Bigbluebutton::RoomsController do
   let(:server) { Factory.create(:bigbluebutton_server) }
   let(:room) { Factory.create(:bigbluebutton_room, :server => server) }
 
-  context "json responses for " do
+  context "json responses for" do
 
     describe "#index" do
       before do
         @room1 = Factory.create(:bigbluebutton_room, :server => server)
         @room2 = Factory.create(:bigbluebutton_room, :server => server)
       end
-      before(:each) { get :index, :server_id => server.to_param, :format => 'json' }
+      before(:each) { get :index, :format => 'json' }
       it { should respond_with(:success) }
       it { should respond_with_content_type(:json) }
       it { should respond_with_json([@room1, @room2].to_json) }
     end
 
     describe "#new" do
-      before(:each) { get :new, :server_id => server.to_param, :format => 'json' }
+      before(:each) { get :new, :format => 'json' }
       it { should respond_with(:success) }
       it { should respond_with_content_type(:json) }
       it {
@@ -30,7 +30,7 @@ describe Bigbluebutton::RoomsController do
     end
 
     describe "#show" do
-      before(:each) { get :show, :server_id => server.to_param, :id => room.to_param, :format => 'json' }
+      before(:each) { get :show, :id => room.to_param, :format => 'json' }
       it { should respond_with(:success) }
       it { should respond_with_content_type(:json) }
       it { should respond_with_json(room.to_json) }
@@ -41,7 +41,7 @@ describe Bigbluebutton::RoomsController do
 
       context "on success" do
         before(:each) {
-          post :create, :server_id => server.to_param, :bigbluebutton_room => new_room.attributes, :format => 'json'
+          post :create, :bigbluebutton_room => new_room.attributes, :format => 'json'
         }
         it { should respond_with(:created) }
         it { should respond_with_content_type(:json) }
@@ -54,7 +54,7 @@ describe Bigbluebutton::RoomsController do
       context "on failure" do
         before(:each) {
           new_room.name = nil # invalid
-          post :create, :server_id => server.to_param, :bigbluebutton_room => new_room.attributes, :format => 'json'
+          post :create, :bigbluebutton_room => new_room.attributes, :format => 'json'
         }
         it { should respond_with(:unprocessable_entity) }
         it { should respond_with_content_type(:json) }
@@ -71,7 +71,7 @@ describe Bigbluebutton::RoomsController do
 
       context "on success" do
         before(:each) {
-          put :update, :server_id => server.to_param, :id => @room.to_param, :bigbluebutton_room => new_room.attributes, :format => 'json'
+          put :update, :id => @room.to_param, :bigbluebutton_room => new_room.attributes, :format => 'json'
         }
         it { should respond_with(:success) }
         it { should respond_with_content_type(:json) }
@@ -84,7 +84,7 @@ describe Bigbluebutton::RoomsController do
       context "on failure" do
         before(:each) {
           new_room.name = nil # invalid
-          put :update, :server_id => server.to_param, :id => @room.to_param, :bigbluebutton_room => new_room.attributes, :format => 'json'
+          put :update, :id => @room.to_param, :bigbluebutton_room => new_room.attributes, :format => 'json'
         }
         it { should respond_with(:unprocessable_entity) }
         it { should respond_with_content_type(:json) }
@@ -103,7 +103,7 @@ describe Bigbluebutton::RoomsController do
           mocked_api.should_receive(:is_meeting_running?).and_return(true)
           mocked_api.should_receive(:end_meeting).with(room.meetingid, room.moderator_password)
         }
-        before(:each) { get :end, :server_id => mocked_server.to_param, :id => room.to_param, :format => 'json' }
+        before(:each) { get :end, :id => room.to_param, :format => 'json' }
         it { should respond_with(:success) }
         it { should respond_with_content_type(:json) }
         it { should respond_with_json(I18n.t('bigbluebutton_rails.rooms.notice.end.success')) }
@@ -111,7 +111,7 @@ describe Bigbluebutton::RoomsController do
 
       context "room is not running" do
         before { mocked_api.should_receive(:is_meeting_running?).and_return(false) }
-        before(:each) { get :end, :server_id => mocked_server.to_param, :id => room.to_param, :format => 'json' }
+        before(:each) { get :end, :id => room.to_param, :format => 'json' }
         it { should respond_with(:error) }
         it { should respond_with_content_type(:json) }
         it { should respond_with_json(I18n.t('bigbluebutton_rails.rooms.notice.end.not_running')) }
@@ -122,7 +122,7 @@ describe Bigbluebutton::RoomsController do
         before {
           mocked_api.should_receive(:is_meeting_running?).and_return{ raise BigBlueButton::BigBlueButtonException.new(msg) }
         }
-        before(:each) { get :end, :server_id => mocked_server.to_param, :id => room.to_param, :format => 'json' }
+        before(:each) { get :end, :id => room.to_param, :format => 'json' }
         it { should respond_with(:error) }
         it { should respond_with_content_type(:json) }
         it { should respond_with_json(msg) }
@@ -139,7 +139,7 @@ describe Bigbluebutton::RoomsController do
           mocked_api.should_receive(:end_meeting)
         }
         before(:each) {
-          delete :destroy, :server_id => mocked_server.to_param, :id => room.to_param, :format => 'json'
+          delete :destroy, :id => room.to_param, :format => 'json'
         }
         it { should respond_with(:success) }
         it { should respond_with_content_type(:json) }
@@ -155,7 +155,7 @@ describe Bigbluebutton::RoomsController do
           mocked_api.should_receive(:is_meeting_running?).and_return{ raise BigBlueButton::BigBlueButtonException.new(msg) }
         }
         before(:each) {
-          delete :destroy, :server_id => mocked_server.to_param, :id => room.to_param, :format => 'json'
+          delete :destroy, :id => room.to_param, :format => 'json'
         }
         it { should respond_with(:error) }
         it { should respond_with_content_type(:json) }