Remove last references to mobile_salt

mconf · Jun 14, 2016 · 2683a6a · 2683a6a
1 parent 15b0ecd
commit 2683a6a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/spec/rails_app/db/seeds.rb b/spec/rails_app/db/seeds.rb
@@ -15,7 +15,6 @@
   end
   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')
 
   BigbluebuttonServer.create!(server)
 end
diff --git a/spec/rails_app/features/step_definitions/activity_monitor_servers_step.rb b/spec/rails_app/features/step_definitions/activity_monitor_servers_step.rb
@@ -1,20 +1,18 @@
 When /^(\d+) meetings running in this server$/ do |count|
-  msalt = FeaturesConfig.server.has_key?('mobile_salt') ? FeaturesConfig.server['mobile_salt'] : ""
   @rooms = []
   count.to_i.times do |i|
     room = FactoryGirl.create(:bigbluebutton_room, :server => @server)
-    BigBlueButtonBot.new(@server.api, room.meetingid, msalt, 1,
+    BigBlueButtonBot.new(@server.api, room.meetingid, nil, 1,
                          FeaturesConfig.root['timeout_bot_start'])
     @rooms << room
   end
 end
 
 When /^(\d+) meetings recently ended in this server$/ do |count|
-  msalt = FeaturesConfig.server.has_key?('mobile_salt') ? FeaturesConfig.server['mobile_salt'] : ""
   @ended_rooms = []
   count.to_i.times do |i|
     room = FactoryGirl.create(:bigbluebutton_room, :server => @server)
-    BigBlueButtonBot.new(@server.api, room.meetingid, msalt, 1,
+    BigBlueButtonBot.new(@server.api, room.meetingid, nil, 1,
                          FeaturesConfig.root['timeout_bot_start'])
     BigBlueButtonBot.finalize(room.meetingid)
     sleep 1

diff --git a/spec/rails_app/features/step_definitions/common_steps.rb b/spec/rails_app/features/step_definitions/common_steps.rb
@@ -102,8 +102,7 @@
 end
 
 When /^a meeting is running in this room with (\d+) attendees$/ do |count|
-  msalt = FeaturesConfig.server.has_key?('mobile_salt') ? FeaturesConfig.server['mobile_salt'] : ""
-  BigBlueButtonBot.new(@server.api, @room.meetingid, msalt,
+  BigBlueButtonBot.new(@server.api, @room.meetingid, nil,
                        count.to_i, FeaturesConfig.root['timeout_bot_start'])
 end