Merge remote-tracking branch 'upstream/master' into dev-erick

Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+ruby '2.3.1'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.0.0', '>= 5.0.0.1'

Gemfile.lock

@@ -233,5 +233,8 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   web-console
 
+RUBY VERSION
+   ruby 2.3.1p112
+
 BUNDLED WITH
    1.13.5

app/lib/bbb_api.rb

@@ -16,11 +16,11 @@
 
 module BbbApi
   def bbb_endpoint
-    Rails.configuration.bigbluebutton_endpoint
+    Rails.configuration.bigbluebutton_endpoint || ''
   end
 
   def bbb_secret
-    Rails.configuration.bigbluebutton_secret
+    Rails.configuration.bigbluebutton_secret || ''
   end
 
   def bbb

test/controllers/landing_controller_test.rb

@@ -17,13 +17,34 @@
 require 'test_helper'
 
 class LandingControllerTest < ActionController::TestCase
+
+  setup do
+    @meeting_id = rand 100000000..999999999
+    @user = users :user1
+  end
+
   test "should get index" do
-    get :index
+    get :index, params: {resource: 'meetings'}
+    assert_response :success
+  end
+
+  test "should get meeting" do
+    get :resource, params: { id: @meeting_id, resource: 'meetings' }
     assert_response :success
   end
 
   test "should get room" do
-    get :room, params: { name: 'user1' }
+    get :resource, params: { id: @user.encrypted_id, resource: 'rooms' }
+    assert_response :success
+  end
+
+  test "should get wait for moderator" do
+    get :wait_for_moderator, params: { id: @user.encrypted_id, resource: 'rooms' }
+    assert_response :success
+  end
+
+  test "should get session status refresh" do
+    get :wait_for_moderator, params: { id: @user.encrypted_id, resource: 'rooms' }
     assert_response :success
   end
 

test/fixtures/users.yml

@@ -16,16 +16,16 @@
 
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
-one:
+user1:
   provider: twitter
   uid: <%= SecureRandom.hex(10) %>
-  encrypted_id: user1
-  name: User 1
   username: user1
+  encrypted_id: u2-<%= SecureRandom.hex(8) %>
+  name: User 1
 
-two:
+user2:
   provider: google
   uid: <%= SecureRandom.hex(10) %>
-  encrypted_id: user2
-  name: User 2
   username: user2
+  encrypted_id: u1-<%= SecureRandom.hex(8) %>
+  name: User 2

test/models/user_test.rb

@@ -17,7 +17,20 @@
 require 'test_helper'
 
 class UserTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+
+  test "should create user from omniauth" do
+    uid = '354545'
+    provider = 'twitter'
+    name = 'user name'
+    username = 'username'
+
+    assert_difference 'User.count' do
+      User.from_omniauth({'uid' => uid, 'provider' => provider, 'info' => {'name' => name, 'nickname' => username}})
+    end
+
+    user = User.find_by uid: uid, provider: provider
+    assert_not_nil user.encrypted_id
+    assert user.username, username
+    assert user.name, name
+  end
 end