bigbluebutton_rails 1.0.0 → 1.1.0

data/spec/rails_app/features/create_rooms.feature

@@ -2,6 +2,11 @@ Feature: Create webconference rooms
   In order to held webconferences
   One needs to create and configure webconference rooms
 
+  Scenario: Access the page to create a new room
+    Given an anonymous user
+    When he goes to the new room page
+    Then he should see the new room page
+
   Scenario: Register a new BigBlueButton room
     Given a real server
     When the user goes to the new room page

data/spec/rails_app/features/create_servers.feature

@@ -2,13 +2,18 @@ Feature: Create webconference servers
   In order to held webconferences
   One needs to create and configure webconference servers
 
-  Scenario: Register a new BigBlueButton server
+  Scenario: Access the page to create a new server
+    Given an anonymous user
+    When he goes to the new server page
+    Then he should see the new server page
+
+  Scenario: Register a new server
     Given an anonymous user
     When he goes to the new server page
       And registers a new server
     Then he should see the information about this server
 
-  Scenario: Try to register a BigBlueButton server with errors
+  Scenario: Try to register a server with errors
     Given an anonymous user
     When he goes to the new server page
       And registers a new server with a wrong URL

data/spec/rails_app/features/edit_rooms.feature

@@ -2,6 +2,13 @@ Feature: Edit webconference rooms
   To change the information of a webconference rooms
   One needs to be able to edit and update the room
 
+  Scenario: Access the page to edit a room
+    Given an anonymous user
+      And a real server
+      And a room in this server
+    When he goes to the edit room page
+    Then he should see the edit room page
+
   Scenario: Edit data in a BigBlueButton room
     Given an anonymous user
       And a real server

data/spec/rails_app/features/edit_servers.feature

@@ -2,7 +2,13 @@ Feature: Edit webconference servers
   To change the information of a webconference server
   One needs to be able to edit and update the server
 
-  Scenario: Edit data in a BigBlueButton server
+  Scenario: Access the page to edit a server
+    Given an anonymous user
+      And a real server
+    When he goes to the edit server page
+    Then he should see the edit server page
+
+  Scenario: Edit data in a server
     Given an anonymous user
       And a real server
     When he goes to the edit server page
@@ -11,7 +17,7 @@ Feature: Edit webconference servers
     Then he should be at the show server URL
       And the server URL should be "http://test.com/bigbluebutton/api"
 
-  Scenario: Try to edit data in a BigBlueButton server with incorrect values
+  Scenario: Try to edit data in a server with incorrect values
     Given an anonymous user
       And a real server
     When he goes to the edit server page

data/spec/rails_app/features/join_rooms.feature

@@ -35,6 +35,7 @@ Feature: Join webconference rooms
       And a private room in this server
     When the user goes to the join room page
     Then he should be redirected to the invite room URL
+      And he should see the invite room page
 
   @mechanize
   Scenario: Joining a private room as a moderator

data/spec/rails_app/features/list_and_show_rooms.feature

@@ -3,16 +3,24 @@ Feature: List and show webconference rooms
   One needs to see the room in a list of rooms
     and see all the information it has stored
 
-  Scenario: View the list of BigBlueButton rooms
+  Scenario: View the list of rooms
     Given an anonymous user
       And a real server
       And 3 rooms in this server
     When he goes to the rooms index page
     Then he should see all available rooms in the list
 
-  Scenario: View all information of a BigBlueButton room
+  Scenario: View all information of a room
     Given an anonymous user
       And a real server
       And a room in this server
     When he goes to the show room page
     Then he should see all the information available for this room
+
+  Scenario: View the list of rooms for a single server
+    Given an anonymous user
+      And a real server
+      And 3 rooms in this server
+      And 2 rooms in any other server
+    When he goes to the server rooms page
+    Then he should see only the rooms from this server

data/spec/rails_app/features/step_definitions/activity_monitor_servers_step.rb

@@ -4,8 +4,8 @@ When /^(\d+) meetings running in this server$/ do |count|
   count.to_i.times do |i|
     room = Factory.create(:bigbluebutton_room, :server => @server)
     room.send_create
-    BigBlueButtonBot.new(@server.api, room.meetingid, msalt,
-                         1, FeaturesConfig.root['timeout_bot_start'])
+    BigBlueButtonBot.new(@server.api, room.meetingid, msalt, 1,
+                         FeaturesConfig.root['timeout_bot_start'])
     @rooms << room
   end
 end
@@ -16,8 +16,8 @@ When /^(\d+) meetings recently ended in this server$/ do |count|
   count.to_i.times do |i|
     room = Factory.create(:bigbluebutton_room, :server => @server)
     room.send_create
-    BigBlueButtonBot.new(@server.api, room.meetingid, msalt,
-                         1, FeaturesConfig.root['timeout_bot_start'])
+    BigBlueButtonBot.new(@server.api, room.meetingid, msalt, 1,
+                         FeaturesConfig.root['timeout_bot_start'])
     BigBlueButtonBot.finalize(room.meetingid)
     sleep 1
     @ended_rooms << room
@@ -76,12 +76,12 @@ def check_server_activity_monitor_rooms(rooms)
         has_content(room.meetingid)
 
         method = room.new_record? ? method(:doesnt_have_element) : method(:has_element)
-        method.call("a", { :href => bigbluebutton_server_room_path(@server, room) })
-        method.call("a", { :href => edit_bigbluebutton_server_room_path(@server, room) })
-        method.call("a", { :href => bigbluebutton_server_room_path(@server, room), :"data-method" => :delete })
-        method.call("a", { :href => join_bigbluebutton_server_room_path(@server, room) })
-        method.call("a", { :href => join_mobile_bigbluebutton_server_room_path(@server, room) })
-        method.call("a", { :href => end_bigbluebutton_server_room_path(@server, room) })
+        method.call("a", { :href => bigbluebutton_room_path(room) })
+        method.call("a", { :href => edit_bigbluebutton_room_path(room) })
+        method.call("a", { :href => bigbluebutton_room_path(room), :"data-method" => :delete })
+        method.call("a", { :href => join_bigbluebutton_room_path(room) })
+        method.call("a", { :href => join_mobile_bigbluebutton_room_path(room) })
+        method.call("a", { :href => end_bigbluebutton_room_path(room) })
 
         room.fetch_is_running?
         if room.is_running?

data/spec/rails_app/features/step_definitions/common_steps.rb

@@ -5,7 +5,6 @@ end
 When /^(\d+) server(s)?$/i do |count, _|
   # Note: these servers are not real, it will NOT be possible to make api requests
   #       for a real server use :bigbluebutton_server_integration
-  # Use "a real server" whenever possible
   count.to_i.times do
     Factory.create(:bigbluebutton_server)
   end
@@ -41,14 +40,17 @@ end
 When /(?:|I ) go(es)? to the (.+) page( \(no view check\))?$/i do |_, page_name, not_check|
   case page_name
   when /join external room/i
-    @params = { :meeting => @room.meetingid }
+    @params = { :meeting => @room.meetingid, :server_id => @server.id }
   end
   visit path_to(page_name, @params)
-  check_template(page_name) if not_check.nil?
 end
 
 When /see the (.+) page$/i do |page_name|
-  check_template(page_name)
+  opts = {
+    :room => @room, :server => @server,
+    :rooms => BigbluebuttonRoom.all, :servers => BigbluebuttonServer.all
+  }
+  check_template(page_name, opts)
 end
 
 When /a user named "(.+)"/i do |username|

data/spec/rails_app/features/step_definitions/create_rooms_steps.rb

@@ -1,5 +1,6 @@
 When /^registers a new room$/i do
   attrs = Factory.attributes_for(:bigbluebutton_room, :server => @server)
+  fill_in("bigbluebutton_room[server_id]", :with => attrs[:server_id])
   fill_in("bigbluebutton_room[name]", :with => attrs[:name])
   fill_in("bigbluebutton_room[meetingid]", :with => attrs[:meetingid])
   check("bigbluebutton_room[randomize_meetingid]") if attrs[:randomize_meetingid]

data/spec/rails_app/features/step_definitions/join_mobile_steps.rb

@@ -1,5 +1,3 @@
 When /^he should see the QR code and a link to join using a mobile device$/i do
-  # FIXME this is already being checked in "he goes to the mobile join page"
-  #       any better ideas?
-  check_template("mobile join")
+  check_template("mobile join", { :room => @room })
 end

data/spec/rails_app/features/step_definitions/join_rooms_steps.rb

@@ -1,17 +1,13 @@
 When /^he should see a form to join the external room$/i do
-  within(form_selector(external_bigbluebutton_server_rooms_path(@server), 'post')) do
-    has_element("input", { :name => 'meeting', :type => 'hidden', :value => @room.meetingid })
-    has_element("input", { :name => 'user[name]', :type => 'text' })
-    has_element("input", { :name => 'user[password]', :type => 'password' })
-  end
+  check_template("join external room")
 end
 
 When /^he should see his name in the user name input$/i do
   case current_url
   when /\/invite$/          # normal rooms
-    form = form_selector(join_bigbluebutton_server_room_path(@server, @room), 'post')
+    form = form_selector(join_bigbluebutton_room_path(@room), 'post')
   when /\/external(\?.*)?/  # external rooms
-    form = form_selector(external_bigbluebutton_server_rooms_path(@server), 'post')
+    form = form_selector(external_bigbluebutton_rooms_path, 'post')
   end
   within(form) do
     has_element("input", { :name => 'user[name]', :type => 'text', :value => @user.name })

data/spec/rails_app/features/step_definitions/list_and_show_rooms_steps.rb

@@ -1,11 +1,18 @@
 When /^he should see all available rooms in the list$/i do
-  # FIXME this is already being checked in "he goes to the rooms index page"
-  #       any better ideas?
   check_template("rooms index")
 end
 
 When /^he should see all the information available for this room$/i do
-  # FIXME this is already being checked in "he goes to the show room page"
-  #       any better ideas?
-  check_template("show room")
+  check_template("show room", { :room => @room })
+end
+
+When /^(\d+) room(s)? in any other server$/i do |count, _|
+  any_other_server = Factory.create(:bigbluebutton_server)
+  count.to_i.times do
+    Factory.create(:bigbluebutton_room, :server => any_other_server)
+  end
+end
+
+When /^he should see only the rooms from this server$/i do
+  check_template("server rooms", { :rooms => @server.rooms })
 end

data/spec/rails_app/features/step_definitions/list_and_show_servers_steps.rb

@@ -1,11 +1,7 @@
 When /^he should see all available servers in the list$/i do
-  # FIXME this is already being checked in "he goes to the servers index page"
-  #       any better ideas?
   check_template("servers index")
 end
 
 When /^he should see all the information available for this server$/i do
-  # FIXME this is already being checked in "he goes to the show server page"
-  #       any better ideas?
-  check_template("show server")
+  check_template("show server", { :server => @server })
 end

data/spec/rails_app/features/support/patches/bigbluebutton_room.rb

@@ -0,0 +1,9 @@
+class BigbluebuttonRoom < ActiveRecord::Base
+
+  protected
+
+  def select_server
+    self.server
+  end
+
+end

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)}" }.join("&") if params
+    params = "?" + params.map{ |k,v| "#{k}=#{CGI::escape(v.to_s)}" }.join("&") if params
 
     case page_name
 
@@ -24,24 +24,26 @@ 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_server_room_path(@server)
+      p = new_bigbluebutton_room_path
     when /rooms index/i, /create room/i
-      p = bigbluebutton_server_rooms_path(@server)
+      p = bigbluebutton_rooms_path
     when /join external room/i
-      p = external_bigbluebutton_server_rooms_path(@server)
+      p = external_bigbluebutton_rooms_path
     when /show room/i
-      p = bigbluebutton_server_room_path(@server, @room)
+      p = bigbluebutton_room_path(@room)
     when /edit room/i
-      p = edit_bigbluebutton_server_room_path(@server, @room)
+      p = edit_bigbluebutton_room_path(@room)
     when /update room/i
-      p = bigbluebutton_server_room_path(@server, @room)
+      p = bigbluebutton_room_path(@room)
     when /join room/i
-      p = join_bigbluebutton_server_room_path(@server, @room)
+      p = join_bigbluebutton_room_path(@room)
     when /invite room/i
-      p = invite_bigbluebutton_server_room_path(@server, @room)
+      p = invite_bigbluebutton_room_path(@room)
     when /mobile join/i
-      p = join_mobile_bigbluebutton_server_room_path(@server, @room)
+      p = join_mobile_bigbluebutton_room_path(@room)
 
     else
       begin

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

@@ -2,26 +2,27 @@
 module TemplateHelpers
 
   # calls the specific methods that verify the template for each page
-  def check_template(page_name)
-    begin
-      method = ("check " + page_name).split(" ").join('_').to_sym
-      self.send(method)
-    rescue NoMethodError
+  def check_template(page_name, options={})
+    method = ("check " + page_name).split(" ").join('_').to_sym
+    unless self.respond_to?(method)
       raise "Can't find method to check the template for \"#{page_name}\"\n" +
-            "Now, go and add the method \"#{method}\" in #{__FILE__}"
+            "Now, go and add the method \"#{method}(options)\" in #{__FILE__}"
     end
+    self.send(method, options)
   end
 
   # servers/new
-  def check_new_server
+  def check_new_server(options)
     within(form_selector(bigbluebutton_servers_path, 'post')) do
       check_server_form
     end
   end
 
   # server/:id/edit
-  def check_edit_server
-    within(form_selector(bigbluebutton_server_path(@server), 'post')) do
+  def check_edit_server(options)
+    server = options[:server] || BigbluebuttonServer.last
+
+    within(form_selector(bigbluebutton_server_path(server), 'post')) do
       check_server_form
     end
   end
@@ -46,29 +47,29 @@ module TemplateHelpers
     has_element("input", { :name => 'commit', :type => 'submit' })
   end
 
-  # 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
+  def check_show_server(options)
+    server = options[: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 => new_bigbluebutton_server_room_path(server) }) # new room link
+    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
   end
 
   # servers/
-  def check_servers_index
+  def check_servers_index(options)
+    servers = options[:severs] || BigbluebuttonServer.all
+
     has_element("a", { :href => new_bigbluebutton_server_path }) # new server link
+    has_element("a", { :href => bigbluebutton_rooms_path }) # rooms list
     n = 1
-    BigbluebuttonServer.all.each do |server|
+    servers.each do |server|
       within(make_selector("ul#bbbrails_servers_list>li:nth(#{n})")) do
         # server data
         has_content(server.name)
@@ -79,7 +80,7 @@ module TemplateHelpers
         has_content(server.url)
         # action links
         has_element("a", { :href => bigbluebutton_server_path(server) }) # show
-        has_element("a", { :href => bigbluebutton_server_rooms_path(server) }) # index
+        has_element("a", { :href => rooms_bigbluebutton_server_path(server) }) # rooms
         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
@@ -89,28 +90,47 @@ module TemplateHelpers
   end
 
   # servers/:id/activity
-  def check_server_activity_monitor
+  def check_server_activity_monitor(options)
+    server = options[:server] || BigbluebuttonServer.last
+
     # 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
-    within(form_selector(bigbluebutton_server_room_path(@server, @room), 'post')) do
+  def check_edit_room(options)
+    room = options[:room] || BigbluebuttonRoom.last
+
+    within(form_selector(bigbluebutton_room_path(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",
@@ -154,8 +174,10 @@ module TemplateHelpers
   end
 
   # room/:id/show
-  def check_show_room
-    room = BigbluebuttonRoom.last
+  def check_show_room(options)
+    room = options[:room] || BigbluebuttonRoom.last
+
+    page_has_content(room.server_id)
     page_has_content(room.name)
     page_has_content(room.meetingid)
     page_has_content(room.randomize_meetingid)
@@ -169,12 +191,23 @@ 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
-    within(form_selector(external_bigbluebutton_server_rooms_path(@server), 'post')) do
-      has_element("input#meeting", { :name => 'meeting', :type => 'hidden', :value => @room.meetingid })
+  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 })
       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' })
@@ -184,8 +217,10 @@ module TemplateHelpers
   end
 
   # rooms/:id/invite
-  def check_invite_room
-    within(form_selector(join_bigbluebutton_server_room_path(@server, @room), 'post')) do
+  def check_invite_room(options)
+    room = options[:room] || BigbluebuttonRoom.last
+
+    within(form_selector(join_bigbluebutton_room_path(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' })
@@ -195,12 +230,16 @@ module TemplateHelpers
   end
 
   # rooms/
-  def check_rooms_index
-    has_element("a", { :href => new_bigbluebutton_server_room_path(@server) }) # new room link
+  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
     n = 1
-    BigbluebuttonRoom.all.each do |room|
+    rooms.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)
@@ -210,24 +249,29 @@ module TemplateHelpers
         has_content(room.voice_bridge)
         has_content(room.param)
         # action links
-        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
+        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
       end
       n += 1
     end
   end
 
-  def check_join_room # nothing to check, it only redirects to the BBB client
+  def check_join_room(options) # nothing to check, it only redirects to the BBB client
   end
 
   # rooms/:id/join_mobile
-  def check_mobile_join
-    url = join_bigbluebutton_server_room_url(@server, @room, :mobile => '1')
+  def check_mobile_join(options)
+    room = options[:room] || BigbluebuttonRoom.last
+
+    url = join_bigbluebutton_room_url(room, :mobile => '1')
     url.gsub!(/http:\/\//i, "bigbluebutton://")
     has_element("a", { :href => url })