bigbluebutton_rails 0.1.1 → 1.0.0

data/spec/rails_app/features/support/paths.rb

@@ -6,7 +6,7 @@ module NavigationHelpers
   # step definition in web_steps.rb
   #
   def path_to(page_name, params=nil)
-    params = "?" + params.map{ |k,v| "#{k}=#{CGI::escape(v.to_s)}" }.join("&") if params
+    params = "?" + params.map{ |k,v| "#{k}=#{CGI::escape(v)}" }.join("&") if params
 
     case page_name
 
@@ -24,26 +24,24 @@ module NavigationHelpers
       p = bigbluebutton_server_path(@server)
     when /server activity monitor/i
       p = activity_bigbluebutton_server_path(@server)
-    when /server rooms/i
-      p = rooms_bigbluebutton_server_path(@server)
     when /new room/i
-      p = new_bigbluebutton_room_path
+      p = new_bigbluebutton_server_room_path(@server)
     when /rooms index/i, /create room/i
-      p = bigbluebutton_rooms_path
+      p = bigbluebutton_server_rooms_path(@server)
     when /join external room/i
-      p = external_bigbluebutton_rooms_path
+      p = external_bigbluebutton_server_rooms_path(@server)
     when /show room/i
-      p = bigbluebutton_room_path(@room)
+      p = bigbluebutton_server_room_path(@server, @room)
     when /edit room/i
-      p = edit_bigbluebutton_room_path(@room)
+      p = edit_bigbluebutton_server_room_path(@server, @room)
     when /update room/i
-      p = bigbluebutton_room_path(@room)
+      p = bigbluebutton_server_room_path(@server, @room)
     when /join room/i
-      p = join_bigbluebutton_room_path(@room)
+      p = join_bigbluebutton_server_room_path(@server, @room)
     when /invite room/i
-      p = invite_bigbluebutton_room_path(@room)
+      p = invite_bigbluebutton_server_room_path(@server, @room)
     when /mobile join/i
-      p = join_mobile_bigbluebutton_room_path(@room)
+      p = join_mobile_bigbluebutton_server_room_path(@server, @room)
 
     else
       begin

data/spec/rails_app/features/support/templates.rb

@@ -2,27 +2,26 @@
 module TemplateHelpers
 
   # calls the specific methods that verify the template for each page
-  def check_template(page_name, options={})
-    method = ("check " + page_name).split(" ").join('_').to_sym
-    unless self.respond_to?(method)
+  def check_template(page_name)
+    begin
+      method = ("check " + page_name).split(" ").join('_').to_sym
+      self.send(method)
+    rescue NoMethodError
       raise "Can't find method to check the template for \"#{page_name}\"\n" +
-            "Now, go and add the method \"#{method}(options)\" in #{__FILE__}"
+            "Now, go and add the method \"#{method}\" in #{__FILE__}"
     end
-    self.send(method, options)
   end
 
   # servers/new
-  def check_new_server(options)
+  def check_new_server
     within(form_selector(bigbluebutton_servers_path, 'post')) do
       check_server_form
     end
   end
 
   # server/:id/edit
-  def check_edit_server(options)
-    server = options[:server] || BigbluebuttonServer.last
-
-    within(form_selector(bigbluebutton_server_path(server), 'post')) do
+  def check_edit_server
+    within(form_selector(bigbluebutton_server_path(@server), 'post')) do
       check_server_form
     end
   end
@@ -47,29 +46,29 @@ module TemplateHelpers
     has_element("input", { :name => 'commit', :type => 'submit' })
   end
 
-  # server/:id/show
-  def check_show_server(options)
-    server = options[:server] || BigbluebuttonServer.last
+  # servers/new
+  def check_new_room
+    within(form_selector(bigbluebutton_server_rooms_path(@server), 'post')) do
+      check_room_form
+    end
+  end
 
+  # server/:id/show
+  def check_show_server
+    server = BigbluebuttonServer.last
     page_has_content(server.name)
     page_has_content(server.url)
     page_has_content(server.salt)
     page_has_content(server.version)
     page_has_content(server.param)
-    has_element("a", { :href => edit_bigbluebutton_server_path(server) }) # edit
-    has_element("a", { :href => activity_bigbluebutton_server_path(server) }) # activity
-    has_element("a", { :href => rooms_bigbluebutton_server_path(server) }) # rooms
-    has_element("a", { :href => bigbluebutton_server_path(server), :"data-method" => 'delete' }) # destroy
+    has_element("a", { :href => new_bigbluebutton_server_room_path(server) }) # new room link
   end
 
   # servers/
-  def check_servers_index(options)
-    servers = options[:severs] || BigbluebuttonServer.all
-
+  def check_servers_index
     has_element("a", { :href => new_bigbluebutton_server_path }) # new server link
-    has_element("a", { :href => bigbluebutton_rooms_path }) # rooms list
     n = 1
-    servers.each do |server|
+    BigbluebuttonServer.all.each do |server|
       within(make_selector("ul#bbbrails_servers_list>li:nth(#{n})")) do
         # server data
         has_content(server.name)
@@ -80,7 +79,7 @@ module TemplateHelpers
         has_content(server.url)
         # action links
         has_element("a", { :href => bigbluebutton_server_path(server) }) # show
-        has_element("a", { :href => rooms_bigbluebutton_server_path(server) }) # rooms
+        has_element("a", { :href => bigbluebutton_server_rooms_path(server) }) # index
         has_element("a", { :href => activity_bigbluebutton_server_path(server) }) # activity
         has_element("a", { :href => edit_bigbluebutton_server_path(server) }) # edit
         has_element("a", { :href => bigbluebutton_server_path(server), :"data-method" => 'delete' }) # destroy
@@ -90,47 +89,28 @@ module TemplateHelpers
   end
 
   # servers/:id/activity
-  def check_server_activity_monitor(options)
-    server = options[:server] || BigbluebuttonServer.last
-
+  def check_server_activity_monitor
     # checks only the 'skeleton', the content depends on the rooms currently running
-    # and is not checked here
     within(make_selector("div.bbbrails_countdown")) do
       has_element("span.bbbrails_countdown_value")
       has_element("a.bbbrails_refresh_now",
-                  { :href => activity_bigbluebutton_server_path(server) })
+                  { :href => activity_bigbluebutton_server_path(@server) })
     end
     has_element("div#bbbrails_server_activity_meetings")
   end
 
-  # servers/:id/rooms
-  def check_server_rooms(options)
-    check_rooms_index(options)
-  end
-
 
 
 
-  # rooms/new
-  def check_new_room(options)
-    within(form_selector(bigbluebutton_rooms_path, 'post')) do
-      check_room_form
-    end
-  end
-
   # room/:id/edit
-  def check_edit_room(options)
-    room = options[:room] || BigbluebuttonRoom.last
-
-    within(form_selector(bigbluebutton_room_path(room), 'post')) do
+  def check_edit_room
+    within(form_selector(bigbluebutton_server_room_path(@server, @room), 'post')) do
       check_room_form
     end
   end
 
   # internal form in rooms/new and room/:id/edit
   def check_room_form
-    has_element("input#bigbluebutton_room_server_id",
-                { :name => 'bigbluebutton_room[server_id]', :type => 'text' })
     has_element("input#bigbluebutton_room_name",
                 { :name => 'bigbluebutton_room[name]', :type => 'text' })
     has_element("input#bigbluebutton_room_meetingid",
@@ -174,10 +154,8 @@ module TemplateHelpers
   end
 
   # room/:id/show
-  def check_show_room(options)
-    room = options[:room] || BigbluebuttonRoom.last
-
-    page_has_content(room.server_id)
+  def check_show_room
+    room = BigbluebuttonRoom.last
     page_has_content(room.name)
     page_has_content(room.meetingid)
     page_has_content(room.randomize_meetingid)
@@ -191,23 +169,12 @@ module TemplateHelpers
     page_has_content(room.max_participants)
     page_has_content(room.external)
     page_has_content(room.param)
-    # action links
-    has_element("a", { :href => edit_bigbluebutton_room_path(room) }) # edit
-    has_element("a", { :href => bigbluebutton_room_path(room) }) # show
-    has_element("a", { :href => join_bigbluebutton_room_path(room) }) # join
-    has_element("a", { :href => invite_bigbluebutton_room_path(room) }) # invite
-    has_element("a", { :href => join_mobile_bigbluebutton_room_path(room) }) # join_mobile
-    has_element("a", { :href => end_bigbluebutton_room_path(room) }) # end
-    has_element("a", { :href => bigbluebutton_room_path(room), :"data-method" => 'delete' }) # destroy
   end
 
   # rooms/external
-  def check_join_external_room(options)
-    room = options[:room] || BigbluebuttonRoom.last
-
-    within(form_selector(external_bigbluebutton_rooms_path, 'post')) do
-      has_element("input#server_id", { :name => 'server_id', :type => 'hidden', :value => room.server_id })
-      has_element("input#meeting", { :name => 'meeting', :type => 'hidden', :value => room.meetingid })
+  def check_join_external_room
+    within(form_selector(external_bigbluebutton_server_rooms_path(@server), 'post')) do
+      has_element("input#meeting", { :name => 'meeting', :type => 'hidden', :value => @room.meetingid })
       has_element("input#user_name", { :name => 'user[name]', :type => 'text' })
       has_element("input#user_password", { :name => 'user[password]', :type => 'password' })
       has_element("label", { :for => 'user_name' })
@@ -217,10 +184,8 @@ module TemplateHelpers
   end
 
   # rooms/:id/invite
-  def check_invite_room(options)
-    room = options[:room] || BigbluebuttonRoom.last
-
-    within(form_selector(join_bigbluebutton_room_path(room), 'post')) do
+  def check_invite_room
+    within(form_selector(join_bigbluebutton_server_room_path(@server, @room), 'post')) do
       has_element("input#user_name", { :name => 'user[name]', :type => 'text' })
       has_element("input#user_password", { :name => 'user[password]', :type => 'password' })
       has_element("label", { :for => 'user_name' })
@@ -230,16 +195,12 @@ module TemplateHelpers
   end
 
   # rooms/
-  def check_rooms_index(options)
-    rooms = options[:rooms] || BigbluebuttonRoom.all
-
-    has_element("a", { :href => new_bigbluebutton_room_path }) # new room link
-    has_element("a", { :href => bigbluebutton_servers_path }) # servers list
+  def check_rooms_index
+    has_element("a", { :href => new_bigbluebutton_server_room_path(@server) }) # new room link
     n = 1
-    rooms.each do |room|
+    BigbluebuttonRoom.all.each do |room|
       within(make_selector("ul#bbbrails_rooms_list>li:nth(#{n})")) do
         # room data
-        has_content(room.server_id) unless room.server.nil?
         has_content(room.name)
         has_content(room.meetingid)
         has_content(room.attendee_password)
@@ -249,29 +210,24 @@ module TemplateHelpers
         has_content(room.voice_bridge)
         has_content(room.param)
         # action links
-        unless room.server.nil?
-          has_element("a", { :href => bigbluebutton_server_path(room.server) }) # show server
-        end
-        has_element("a", { :href => bigbluebutton_room_path(room) }) # show
-        has_element("a", { :href => join_bigbluebutton_room_path(room) }) # join
-        has_element("a", { :href => invite_bigbluebutton_room_path(room) }) # invite
-        has_element("a", { :href => join_mobile_bigbluebutton_room_path(room) }) # join_mobile
-        has_element("a", { :href => edit_bigbluebutton_room_path(room) }) # edit
-        has_element("a", { :href => end_bigbluebutton_room_path(room) }) # end
-        has_element("a", { :href => bigbluebutton_room_path(room), :"data-method" => 'delete' }) # destroy
+        has_element("a", { :href => bigbluebutton_server_room_path(@server, room) }) # show
+        has_element("a", { :href => join_bigbluebutton_server_room_path(@server, room) }) # join
+        has_element("a", { :href => invite_bigbluebutton_server_room_path(@server, room) }) # invite
+        has_element("a", { :href => join_mobile_bigbluebutton_server_room_path(@server, room) }) # join_mobile
+        has_element("a", { :href => edit_bigbluebutton_server_room_path(@server, room) }) # edit
+        has_element("a", { :href => end_bigbluebutton_server_room_path(@server, room) }) # end
+        has_element("a", { :href => bigbluebutton_server_room_path(@server, room), :"data-method" => 'delete' }) # destroy
       end
       n += 1
     end
   end
 
-  def check_join_room(options) # nothing to check, it only redirects to the BBB client
+  def check_join_room # nothing to check, it only redirects to the BBB client
   end
 
   # rooms/:id/join_mobile
-  def check_mobile_join(options)
-    room = options[:room] || BigbluebuttonRoom.last
-
-    url = join_bigbluebutton_room_url(room, :mobile => '1')
+  def check_mobile_join
+    url = join_bigbluebutton_server_room_url(@server, @room, :mobile => '1')
     url.gsub!(/http:\/\//i, "bigbluebutton://")
     has_element("a", { :href => url })
 

data/spec/routing/bigbluebutton/custom_controllers_routing_spec.rb

@@ -34,67 +34,51 @@ describe ActionController do
       {:delete => "/custom/servers/1"}.
       should route_to(:controller => "custom_servers", :action => "destroy", :id => "1")
     }
-    it {
-      {:get => "/custom/servers/1/activity"}.
-      should route_to(:controller => "custom_servers", :action => "activity", :id => "1")
-    }
 
     # custom controllers - rooms
     it {
-      {:get => "/custom/rooms"}.
-      should route_to(:controller => "custom_rooms", :action => "index")
-    }
-    it {
-      {:get => "/custom/rooms/new"}.
-      should route_to(:controller => "custom_rooms", :action => "new")
-    }
-    it {
-      {:get => "/custom/rooms/1"}.
-      should route_to(:controller => "custom_rooms", :action => "show", :id => "1")
-    }
-    it {
-      {:get => "/custom/rooms/1/edit"}.
-      should route_to(:controller => "custom_rooms", :action => "edit", :id => "1")
+      {:get => "/custom/servers/1/rooms"}.
+      should route_to(:controller => "custom_rooms", :action => "index", :server_id => "1")
     }
     it {
-      {:put => "/custom/rooms/1"}.
-      should route_to(:controller => "custom_rooms", :action => "update", :id => "1")
+      {:get => "/custom/servers/1/rooms/new"}.
+      should route_to(:controller => "custom_rooms", :action => "new", :server_id => "1")
     }
     it {
-      {:delete => "/custom/rooms/1"}.
-      should route_to(:controller => "custom_rooms", :action => "destroy", :id => "1")
+      {:get => "/custom/servers/1/rooms/1/edit"}.
+      should route_to(:controller => "custom_rooms", :action => "edit", :server_id => "1", :id => "1")
     }
     it {
-      {:get => "/custom/rooms/external"}.
-      should route_to(:controller => "custom_rooms", :action => "external")
+      {:get => "/custom/servers/1/rooms/1"}.
+      should route_to(:controller => "custom_rooms", :action => "show", :server_id => "1", :id => "1")
     }
     it {
-      {:post => "/custom/rooms/external"}.
-      should route_to(:controller => "custom_rooms", :action => "external_auth")
+      {:put => "/custom/servers/1/rooms/1"}.
+      should route_to(:controller => "custom_rooms", :action => "update", :server_id => "1", :id => "1")
     }
     it {
-      {:get => "/custom/rooms/1/join"}.
-      should route_to(:controller => "custom_rooms", :action => "join", :id => "1")
+      {:delete => "/custom/servers/1/rooms/1"}.
+      should route_to(:controller => "custom_rooms", :action => "destroy", :server_id => "1", :id => "1")
     }
     it {
-      {:get => "/custom/rooms/1/join_mobile"}.
-      should route_to(:controller => "custom_rooms", :action => "join_mobile" ,:id => "1")
+      {:get => "/custom/servers/1/rooms/1/join"}.
+      should route_to(:controller => "custom_rooms", :action => "join", :server_id => "1", :id => "1")
     }
     it {
-      {:get => "/custom/rooms/1/running"}.
-      should route_to(:controller => "custom_rooms", :action => "running", :id => "1")
+      {:get => "/custom/servers/1/rooms/1/running"}.
+      should route_to(:controller => "custom_rooms", :action => "running", :server_id => "1", :id => "1")
     }
     it {
-      {:get => "/custom/rooms/1/end"}.
-      should route_to(:controller => "custom_rooms", :action => "end", :id => "1")
+      {:get => "/custom/servers/1/rooms/1/end"}.
+      should route_to(:controller => "custom_rooms", :action => "end", :server_id => "1", :id => "1")
     }
     it {
-      {:get => "/custom/rooms/1/invite"}.
-      should route_to(:controller => "custom_rooms", :action => "invite", :id => "1")
+      {:get => "/custom/servers/1/rooms/1/invite"}.
+      should route_to(:controller => "custom_rooms", :action => "invite", :server_id => "1", :id => "1")
     }
     it {
-      {:post => "/custom/rooms/1/join"}.
-      should route_to(:controller => "custom_rooms", :action => "auth", :id => "1")
+      {:post => "/custom/servers/1/rooms/1/join"}.
+      should route_to(:controller => "custom_rooms", :action => "auth", :server_id => "1", :id => "1")
     }
 
   end