Fix tests after 4f6f444

config/reserved_words.yml

@@ -1,7 +1,6 @@
 words:
 - account
 - activity
-- admin
 - api
 - assets
 - blog

spec/features/feedback_spec.rb

@@ -19,7 +19,7 @@ def send_feedback subj, message, email=nil
 
   describe 'as a signed in user' do
     before {
-      @user = FactoryGirl.create(:user, :username => 'user', :password => 'password')
+      @user = FactoryGirl.create(:user, :username => 'user-1', :password => 'password')
       login_as(@user, :as => :user)
       visit new_feedback_path
     }

spec/features/ldap/misconfiguration_spec.rb

@@ -23,7 +23,7 @@
     port = Mconf::LdapServer.default_ldap_configs[:ldap_port]
     Site.current.update_attributes ldap_port: port + 1
 
-    user = FactoryGirl.create(:user, username: 'user', password: 'password')
+    user = FactoryGirl.create(:user, username: 'user-1', password: 'password')
     sign_in_with user.email, user.password
 
     expect(page).to have_title(I18n.t('home.my'))
@@ -34,7 +34,7 @@
   scenario "doesn't break the local sign in with unreacheable server" do
     Site.current.update_attributes ldap_host: "nonexistanturl.doesntexist"
 
-    user = FactoryGirl.create(:user, username: 'user', password: 'password')
+    user = FactoryGirl.create(:user, username: 'user-1', password: 'password')
     sign_in_with user.email, user.password
 
     expect(page).to have_title(I18n.t('home.my'))

spec/features/redirect_back_spec.rb

@@ -9,7 +9,7 @@
 feature 'Visitor logs in and is redirected back to a sane URL' do
 
   before(:each) {
-    @user = FactoryGirl.create(:user, :username => 'user', :password => 'password')
+    @user = FactoryGirl.create(:user, :username => 'user-1', :password => 'password')
   }
 
   context 'when referer is blank' do

spec/features/visitor_logs_in_spec.rb

@@ -8,7 +8,7 @@
 
 feature 'Visitor logs in' do
   before(:each) {
-    @user = FactoryGirl.create(:user, :username => 'user', :password => 'password')
+    @user = FactoryGirl.create(:user, :username => 'user-1', :password => 'password')
     page.driver.header 'Referer', "http://#{Site.current.domain}"
   }
 

spec/routing/custom_bigbluebutton_rooms_routing_spec.rb

@@ -28,6 +28,7 @@
       }
       after {
         configatron.conf.scope_rooms = @previous
+        Rails.application.reload_routes!
       }
       it { should route(:get, "/webconf/my-room").to(action: :invite_userid, id: "my-room") }
     end
@@ -40,6 +41,7 @@
       }
       after {
         configatron.conf.scope_rooms = @previous
+        Rails.application.reload_routes!
       }
       it { should route(:get, "/my-room").to(action: :invite_userid, id: "my-room") }
     end

spec/routing/users_routing_spec.rb

@@ -22,7 +22,5 @@
     it { should route(:post, "/users").to(:action => :create) }
     it { should route(:post, "/users/u1/approve").to(:action => :approve, :id => "u1") }
     it { should route(:post, "/users/u1/disapprove").to(:action => :disapprove, :id => "u1") }
-
-    it { { get: "/users" }.should_not be_routable }
   end
 end

spec/support/mconf_ldap_server.rb

@@ -40,7 +40,7 @@ def add_default_user
 
     def self.default_user
       {
-        username: 'mconf',
+        username: 'mconf-user',
         password: 'mconf',
         email: '[email protected]'
       }