diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-31 23:34:12 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-31 23:34:12 +0100 |
| commit | b1da1db0eb5d738d5d5e5379796c048614d2ba00 (patch) | |
| tree | a0ad3610338ffc5c911554d2915ed77194957144 /apps/files_external/tests/google.php | |
| parent | de00111c1f20b46814971e1e0afac37fcb5c2886 (diff) | |
| parent | 317261d6dfa2b95234628c6e6649bcb94999552a (diff) | |
| download | nextcloud-server-b1da1db0eb5d738d5d5e5379796c048614d2ba00.tar.gz nextcloud-server-b1da1db0eb5d738d5d5e5379796c048614d2ba00.zip | |
Merge branch 'master' into from_live_to_on
Conflicts:
apps/files_external/js/google.js
Diffstat (limited to 'apps/files_external/tests/google.php')
| -rw-r--r-- | apps/files_external/tests/google.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/files_external/tests/google.php b/apps/files_external/tests/google.php index 379bf992ff5..f344163a8b9 100644 --- a/apps/files_external/tests/google.php +++ b/apps/files_external/tests/google.php @@ -20,8 +20,9 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -class Test_Filestorage_Google extends Test_FileStorage { +namespace Test\Files\Storage; +class Google extends Storage { private $config; public function setUp() { @@ -31,7 +32,7 @@ class Test_Filestorage_Google extends Test_FileStorage { $this->markTestSkipped('Google backend not configured'); } $this->config['google']['root'] .= '/' . $id; //make sure we have an new empty folder to work in - $this->instance = new OC_Filestorage_Google($this->config['google']); + $this->instance = new \OC\Files\Storage\Google($this->config['google']); } public function tearDown() { |