bigbluebutton_rails 1.4.0 → 2.0.0

data/spec/rails_app/config/environments/development.rb

@@ -22,10 +22,5 @@ RailsApp::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  config.eager_load = false
 end

data/spec/rails_app/config/environments/production.rb

@@ -55,4 +55,6 @@ RailsApp::Application.configure do
 
   # Generate digests for assets URLs
   config.assets.digest = true
+
+  config.eager_load = true
 end

data/spec/rails_app/config/environments/test.rb

@@ -42,4 +42,6 @@ RailsApp::Application.configure do
 
   # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
   config.assets.allow_debugging = true
+
+  config.eager_load = false
 end

data/spec/rails_app/config/routes.rb

@@ -23,11 +23,14 @@ RailsApp::Application.routes.draw do
     bigbluebutton_routes :default, :only => "recordings"
   end
 
+  get "bigbluebutton/my_playback_types", :to => 'my_playback_types#index', :as => "my_playback_types"
+
+  # TODO: this is needed for the tests, but break the views when running the test app
   bigbluebutton_routes :default,
     :scope => "custom",
     :controllers => { :servers => "custom_servers",
-                      :rooms => "custom_rooms",
-                      :recordings => "custom_recordings" },
+      :rooms => "custom_rooms",
+      :recordings => "custom_recordings" },
     :as => "custom_name"
 
   root :to => "frontpage#show"

data/spec/rails_app/db/seeds.rb

@@ -13,7 +13,7 @@ if File.exists?(file)
   else
     server = config['servers'][config['servers'].keys.first]
   end
-  server['version'] = '0.7' unless server.has_key?('version')
+  server['version'] = '0.9' unless server.has_key?('version')
   server['name'] = URI.parse(server['url']).host
   server.delete('mobile_salt') if server.has_key?('mobile_salt')
 

data/spec/rails_app/features/config.yml.example

@@ -5,9 +5,8 @@ servers:
   bbb-dev-07:
     salt: 'your-salt'
     url: 'http://your-server/bigbluebutton/api'
-    version: '0.7'
-  test-install-08:
+    version: '0.9'
+  test-install-09:
     salt: '8cd8ef52e8e101574e400365b55e11a6'
     url: 'http://test-install.blindsidenetworks.com/bigbluebutton/api'
-    version: '0.8'
-    mobile_salt: '03b07' # needed for >= 0.8
+    version: '0.9'

data/spec/rails_app/features/join_rooms.feature

@@ -5,7 +5,7 @@ Feature: Join webconference rooms
   # These scenarios are based in the permission defined in the default
   # bigbluebutton_role method:
   # if room.private or bigbluebutton_user.nil?
-  #   :password # ask for a password
+  #   :key # ask for a key
   # else
   #   :moderator
   # end
@@ -21,7 +21,7 @@ Feature: Join webconference rooms
     When the user goes to the join room page
     Then he should join the conference room
 
-  Scenario: Joining a private room requires a password
+  Scenario: Joining a private room requires a key
     Given a user named "test user"
       And a real server
       And a private room in this server
@@ -35,7 +35,7 @@ Feature: Join webconference rooms
       And a real server
       And a private room in this server
     When the user goes to the join room page
-      And enters his name and the moderator password
+      And enters his name and the moderator key
       And clicks in the button "Submit"
     Then he should join the conference room
 
@@ -44,7 +44,7 @@ Feature: Join webconference rooms
       And a real server
       And a private room in this server
     When the user goes to the join room page
-      And enters his name and the attendee password
+      And enters his name and the attendee key
       And clicks in the button "Submit"
     Then he should NOT join the conference room
       And should see an error message with the message "The meeting is not running"
@@ -56,7 +56,7 @@ Feature: Join webconference rooms
       And a private room in this server
       And a meeting is running in this room
     When the user goes to the join room page
-      And enters his name and the attendee password
+      And enters his name and the attendee key
       And clicks in the button "Submit"
     Then he should join the conference room
 
@@ -65,12 +65,12 @@ Feature: Join webconference rooms
       And a real server
       And a private room in this server
     When the user goes to the join room page
-      And enters only the moderator password
+      And enters only the moderator key
       And clicks in the button "Submit"
     Then he should NOT join the conference room
       And should see an error message with the message "Authentication failure"
 
-  Scenario: Joining a private room without entering a password (wrong password)
+  Scenario: Joining a private room without entering a key (wrong key)
     Given an anonymous user
       And a real server
       And a private room in this server
@@ -102,7 +102,7 @@ Feature: Join webconference rooms
 
   # Test the invite view with a user logged
 
-  Scenario: The invite page is pre-filled with the user name and moderator password
+  Scenario: The invite page is pre-filled with the user name and moderator key
     Given a user named "test user"
       And a real server
       # Public room = user is a moderator
@@ -110,16 +110,16 @@ Feature: Join webconference rooms
     When the user goes to the invite room page (no view check)
     Then he should be at the invite room URL
       And the read-only name field was pre-filled with "test user"
-      And the read-only password field was pre-filled with the moderator password
+      And the read-only key field was pre-filled with the moderator key
 
   Scenario: The invite page is pre-filled with the user name only
     Given a user named "test user"
       And a real server
-      # Private room = ask for a password
+      # Private room = ask for a key
       And a private room in this server
     When the user goes to the invite room page (no view check)
     Then the read-only name field was pre-filled with "test user"
-      And the password field was NOT pre-filled
+      And the key field was NOT pre-filled
 
   # Test the invite view without a user logged
 
@@ -129,7 +129,7 @@ Feature: Join webconference rooms
       And a public room in this server
     When the user goes to the invite room page
     Then the name field was NOT pre-filled
-      And the password field was NOT pre-filled
+      And the key field was NOT pre-filled
 
   # Test if the user can actually join the conference
 
@@ -148,7 +148,7 @@ Feature: Join webconference rooms
       And a real server
       And a public room in this server
     When the user goes to the invite room page
-      And enters his name and the moderator password
+      And enters his name and the moderator key
       And clicks in the button "Submit"
     Then he should join the conference room
 
@@ -167,7 +167,7 @@ Feature: Join webconference rooms
       And a real server
       And a public room in this server
     When the user goes to the invite room with mobile page
-      And enters his name and the moderator password
+      And enters his name and the moderator key
       And clicks in the button to join the conference from a mobile device
     Then he should be redirected to the conference using the "bigbluebutton://" protocol
 

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

@@ -47,9 +47,9 @@ end
 When /^he should see one meeting running and the other meeting not running$/ do
   # first was ended, second is running
   @rooms.first.fetch_is_running?
-  @rooms.first.is_running?.should be_false
+  @rooms.first.is_running?.should be_falsey
   @rooms.last.fetch_is_running?
-  @rooms.last.is_running?.should be_true
+  @rooms.last.is_running?.should be_truthy
 
   # the ended meeting won't appear in the list in BBB 0.8
   @rooms.delete(@rooms.first) if @server.version >= "0.8"

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

@@ -4,8 +4,8 @@ When /^registers a new room$/i do
   fill_in("bigbluebutton_room[name]", :with => attrs[:name])
   fill_in("bigbluebutton_room[meetingid]", :with => attrs[:meetingid])
   check("bigbluebutton_room[private]") if attrs[:private]
-  fill_in("bigbluebutton_room[attendee_password]", :with => attrs[:attendee_password])
-  fill_in("bigbluebutton_room[moderator_password]", :with => attrs[:moderator_password])
+  fill_in("bigbluebutton_room[attendee_key]", :with => attrs[:attendee_key])
+  fill_in("bigbluebutton_room[moderator_key]", :with => attrs[:moderator_key])
   fill_in("bigbluebutton_room[welcome_msg]", :with => attrs[:welcome_msg])
   fill_in("bigbluebutton_room[logout_url]", :with => attrs[:logout_url])
   fill_in("bigbluebutton_room[dial_number]", :with => attrs[:dial_number])
@@ -21,8 +21,8 @@ When /^registers a new room with wrong parameters$/i do
   fill_in("bigbluebutton_room[name]", :with => nil) # invalid
   fill_in("bigbluebutton_room[meetingid]", :with => attrs[:meetingid])
   check("bigbluebutton_room[private]") if attrs[:private]
-  fill_in("bigbluebutton_room[attendee_password]", :with => attrs[:attendee_password])
-  fill_in("bigbluebutton_room[moderator_password]", :with => attrs[:moderator_password])
+  fill_in("bigbluebutton_room[attendee_key]", :with => attrs[:attendee_key])
+  fill_in("bigbluebutton_room[moderator_key]", :with => attrs[:moderator_key])
   fill_in("bigbluebutton_room[welcome_msg]", :with => attrs[:welcome_msg])
   fill_in("bigbluebutton_room[logout_url]", :with => attrs[:logout_url])
   fill_in("bigbluebutton_room[dial_number]", :with => attrs[:dial_number])

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

@@ -9,8 +9,8 @@ When /^the removed room should not be listed$/i do
   # check params that are specific for this server
   doesnt_have_content(@room.meetingid)
   doesnt_have_content(@room.name)
-  doesnt_have_content(@room.attendee_password)
-  doesnt_have_content(@room.moderator_password)
+  doesnt_have_content(@room.attendee_key)
+  doesnt_have_content(@room.moderator_key)
   doesnt_have_content(@room.voice_bridge)
   doesnt_have_content(@room.param)
 end

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

@@ -16,16 +16,16 @@ When /^he should( not)? join the conference room$/i do |negate|
   end
 end
 
-When /^enters his name and the (.+) password$/i do |role|
+When /^enters his name and the (.+) key$/i do |role|
   name = @user.nil? ? "Anonymous" : @user.name
-  password = role.downcase.to_sym == :moderator ? @room.moderator_password : @room.attendee_password
+  key = role.downcase.to_sym == :moderator ? @room.moderator_key : @room.attendee_key
   fill_in("user[name]", :with => name)
-  fill_in("user[password]", :with => password)
+  fill_in("user[key]", :with => key)
 end
 
-When /^enters only the (.+) password$/ do |role|
-  password = role.downcase.to_sym == :moderator ? @room.moderator_password : @room.attendee_password
-  fill_in("user[password]", :with => password)
+When /^enters only the (.+) key$/ do |role|
+  key = role.downcase.to_sym == :moderator ? @room.moderator_key : @room.attendee_key
+  fill_in("user[key]", :with => key)
   fill_in("user[name]", :with => "")
 end
 
@@ -34,12 +34,12 @@ When /^enters only the user name$/ do
   fill_in("user[name]", :with => name)
 end
 
-When /^the read-only password field was pre-filled with the moderator password$/ do
-  has_element("input", { :name => 'user[password]', :type => 'password', :value => @room.moderator_password, :readonly => 'readonly' })
+When /^the read-only key field was pre-filled with the moderator key$/ do
+  has_element("input", { :name => 'user[key]', :type => 'password', :value => @room.moderator_key, :readonly => 'readonly' })
 end
 
-When /^the password field was not pre-filled$/i do
-  has_element("input", { :name => 'user[password]', :type => 'password', :value => '' })
+When /^the key field was not pre-filled$/i do
+  has_element("input", { :name => 'user[key]', :type => 'password', :value => '' })
 end
 
 When /^the read-only name field was pre-filled with "(.+)"$/ do |name|

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

@@ -170,7 +170,7 @@ Then /^the "([^"]*)" checkbox(?: within (.*))? should be checked$/ do |label, pa
   with_scope(parent) do
     field_checked = find_field(label)['checked']
     if field_checked.respond_to? :should
-      field_checked.should be_true
+      field_checked.should be_truthy
     else
       assert field_checked
     end
@@ -181,7 +181,7 @@ Then /^the "([^"]*)" checkbox(?: within (.*))? should not be checked$/ do |label
   with_scope(parent) do
     field_checked = find_field(label)['checked']
     if field_checked.respond_to? :should
-      field_checked.should be_false
+      field_checked.should be_falsey
     else
       assert !field_checked
     end

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

@@ -27,7 +27,7 @@ class FeaturesConfig
     else
       server = self.root['servers'].first[1]
     end
-    server['version'] = '0.7' unless server.has_key?('version')
+    server['version'] = '0.9' unless server.has_key?('version')
     server['name'] = URI.parse(server['url']).host
     self.server = server
   end

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

@@ -137,10 +137,10 @@ module TemplateHelpers
                 { :name => 'bigbluebutton_room[meetingid]', :type => 'text' })
     has_element("input#bigbluebutton_room_private",
                 { :name => 'bigbluebutton_room[private]', :type => 'checkbox' })
-    has_element("input#bigbluebutton_room_attendee_password",
-                { :name => 'bigbluebutton_room[attendee_password]', :type => 'text' })
-    has_element("input#bigbluebutton_room_moderator_password",
-                { :name => 'bigbluebutton_room[moderator_password]', :type => 'text' })
+    has_element("input#bigbluebutton_room_attendee_key",
+                { :name => 'bigbluebutton_room[attendee_key]', :type => 'text' })
+    has_element("input#bigbluebutton_room_moderator_key",
+                { :name => 'bigbluebutton_room[moderator_key]', :type => 'text' })
     has_element("input#bigbluebutton_room_welcome_msg",
                 { :name => 'bigbluebutton_room[welcome_msg]', :type => 'text' })
     has_element("input#bigbluebutton_room_logout_url",
@@ -158,8 +158,8 @@ module TemplateHelpers
     has_element("label", { :for => 'bigbluebutton_room_name' })
     has_element("label", { :for => 'bigbluebutton_room_meetingid' })
     has_element("label", { :for => 'bigbluebutton_room_private' })
-    has_element("label", { :for => 'bigbluebutton_room_attendee_password' })
-    has_element("label", { :for => 'bigbluebutton_room_moderator_password' })
+    has_element("label", { :for => 'bigbluebutton_room_attendee_key' })
+    has_element("label", { :for => 'bigbluebutton_room_moderator_key' })
     has_element("label", { :for => 'bigbluebutton_room_welcome_msg' })
     has_element("label", { :for => 'bigbluebutton_room_logout_url' })
     has_element("label", { :for => 'bigbluebutton_room_dial_number' })
@@ -178,8 +178,8 @@ module TemplateHelpers
     page_has_content(room.name)
     page_has_content(room.meetingid)
     page_has_content(room.private)
-    page_has_content(room.attendee_password)
-    page_has_content(room.moderator_password)
+    page_has_content(room.attendee_key)
+    page_has_content(room.moderator_key)
     page_has_content(room.welcome_msg)
     page_has_content(room.logout_url)
     page_has_content(room.dial_number)
@@ -203,9 +203,9 @@ module TemplateHelpers
 
     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("input#user_key", { :name => 'user[key]', :type => 'password' })
       has_element("label", { :for => 'user_name' })
-      has_element("label", { :for => 'user_password' })
+      has_element("label", { :for => 'user_key' })
       has_element("input", { :name => 'commit', :type => 'submit' })
     end
   end
@@ -223,8 +223,8 @@ module TemplateHelpers
         has_content(room.server_id) unless room.server.nil?
         has_content(room.name)
         has_content(room.meetingid)
-        has_content(room.attendee_password)
-        has_content(room.moderator_password)
+        has_content(room.attendee_key)
+        has_content(room.moderator_key)
         has_content(room.logout_url)
         has_content(room.dial_number)
         has_content(room.voice_bridge)

data/spec/rails_app/lib/tasks/db/populate.rake

@@ -12,13 +12,23 @@ namespace :db do
     BigbluebuttonMetadata.destroy_all
     BigbluebuttonPlaybackFormat.destroy_all
 
+    ids = ["presentation", "presentation_video", "slides"]
+    3.times do |i|
+      params = {
+        :identifier => ids[i],
+        :visible => Forgery(:basic).boolean
+      }
+      puts "- Creating playback type #{params[:identifier]}"
+      BigbluebuttonPlaybackType.create!(params)
+    end
+
     # Servers
     2.times do |n1|
       params = {
         :name => "Server #{n1}",
         :url => "http://bigbluebutton#{n1}.test.com/bigbluebutton/api",
         :salt => Forgery(:basic).password(:at_least => 30, :at_most => 40),
-        :version => '0.8',
+        :version => '0.9',
         :param => "server-#{n1}"
       }
       puts "- Creating server #{params[:name]}"
@@ -30,13 +40,13 @@ namespace :db do
           :meetingid => "meeting-#{n1}-#{n2}-" + SecureRandom.hex(4),
           :server => server,
           :name => "Name-#{n1}-#{n2}",
-          :attendee_password => Forgery(:basic).password(:at_least => 10, :at_most => 16),
-          :moderator_password => Forgery(:basic).password(:at_least => 10, :at_most => 16),
+          :attendee_key => Forgery(:basic).password(:at_least => 10, :at_most => 16),
+          :moderator_key => Forgery(:basic).password(:at_least => 10, :at_most => 16),
           :welcome_msg => Forgery(:lorem_ipsum).sentences(2),
           :private => false,
           :param => "meeting-#{n1}-#{n2}",
           :external => false,
-          :record => false,
+          :record_meeting => false,
           :duration => 0
         }
         puts "  - Creating room #{params[:name]}"
@@ -102,15 +112,18 @@ namespace :db do
           end
 
           # Recording playback formats
-          2.times do |n_format|
+          playback_types = [1,2,3]
+          3.times do |n_format|
             params = {
-              :format_type => "#{Forgery(:name).first_name.downcase}-#{n_format}",
               :url => "http://" + Forgery(:internet).domain_name + "/playback",
               :length => Forgery(:basic).number
             }
             puts "      - Creating playback format #{params[:format_type]}"
             format = BigbluebuttonPlaybackFormat.create(params)
             format.recording = recording
+            id = playback_types[rand(playback_types.length)]
+            playback_types.delete(id)
+            format.playback_type = BigbluebuttonPlaybackType.find(id)
             format.save!
           end
 

data/spec/routing/bigbluebutton/custom_controllers_routing_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ActionController do
   include Shoulda::Matchers::ActionController
 
-  describe "routing" do
+  describe "routing", :type => :routing do
 
     # custom controllers - servers
     it {

data/spec/routing/bigbluebutton/recordings_only_routing_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ActionController do
   include Shoulda::Matchers::ActionController
 
-  describe "routing with :only => 'recordings'" do
+  describe "routing with :only => 'recordings'", :type => :routing do
 
     it {
       {:get => "/only-recordings/bigbluebutton/recordings"}.
@@ -26,7 +26,7 @@ describe ActionController do
       should route_to(:controller => "bigbluebutton/recordings", :action => "destroy", :id => "rec-1")
     }
     it {
-      {:get => "/only-recordings/bigbluebutton/recordings/rec-1/play?type=any"}.
+      {:get => "/only-recordings/bigbluebutton/recordings/rec-1/play"}.
       should route_to(:controller => "bigbluebutton/recordings", :action => "play", :id => "rec-1")
     }
     it {

data/spec/routing/bigbluebutton/recordings_routing_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Bigbluebutton::RecordingsController do
   include Shoulda::Matchers::ActionController
 
-  describe "routing" do
+  describe "routing", :type => :routing do
 
     # default and scoped routes
     ['bigbluebutton', 'webconference'].each do |prefix|
@@ -29,7 +29,7 @@ describe Bigbluebutton::RecordingsController do
       }
       it {
         {:get => "/#{prefix}/recordings/rec-1/play?type=any"}.
-        should route_to(:controller => "bigbluebutton/recordings", :action => "play", :id => "rec-1")
+        should route_to(:controller => "bigbluebutton/recordings", :action => "play", :id => "rec-1", :type => "any")
       }
       it {
         {:post => "/#{prefix}/recordings/rec-1/publish"}.