Merge branch 'cleanup/mocha' into 'master'

Gemfile

Gemfile.lock

extensions/pages/asset_page/test/unit/asset_page_test.rb

test/functional/assets_controller_test.rb

test/functional/me/destroys_controller_test.rb

test/functional/me/pages_controller_test.rb

test/integration/asset_media_test.rb

test/integration/visibility_test.rb

test/test_helper.rb

test/unit/asset/text_test.rb

test/unit/asset_test.rb

test/unit/page/history/grant_group_access_test.rb

test/unit/request_model_test.rb

test/unit/request_test.rb

test/unit/requests/request_to_remove_user_test.rb

test/unit/tracking/action_test.rb

test/unit/wiki/decorator_test.rb