| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "ash/common/system/status_area_widget.h" |
| 8 #include "ash/common/system/web_notification/web_notification_tray.h" |
| 9 #include "ash/test/status_area_widget_test_helper.h" |
| 7 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 8 #include "base/macros.h" | 11 #include "base/macros.h" |
| 9 #include "base/run_loop.h" | 12 #include "base/run_loop.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 11 #include "base/threading/sequenced_worker_pool.h" | 14 #include "base/threading/sequenced_worker_pool.h" |
| 12 #include "chrome/browser/chrome_notification_types.h" | 15 #include "chrome/browser/chrome_notification_types.h" |
| 13 #include "chrome/browser/chromeos/login/login_manager_test.h" | 16 #include "chrome/browser/chromeos/login/login_manager_test.h" |
| 14 #include "chrome/browser/chromeos/login/startup_utils.h" | 17 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 15 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" | 18 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" |
| 16 #include "chrome/browser/chromeos/login/supervised/supervised_user_test_base.h" | 19 #include "chrome/browser/chromeos/login/supervised/supervised_user_test_base.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 34 #include "content/public/test/browser_test_utils.h" | 37 #include "content/public/test/browser_test_utils.h" |
| 35 #include "content/public/test/test_utils.h" | 38 #include "content/public/test/test_utils.h" |
| 36 | 39 |
| 37 using testing::_; | 40 using testing::_; |
| 38 using chromeos::SupervisedUserTestBase; | 41 using chromeos::SupervisedUserTestBase; |
| 39 using chromeos::kTestSupervisedUserDisplayName; | 42 using chromeos::kTestSupervisedUserDisplayName; |
| 40 using chromeos::kTestManager; | 43 using chromeos::kTestManager; |
| 41 | 44 |
| 42 namespace chromeos { | 45 namespace chromeos { |
| 43 | 46 |
| 47 namespace { |
| 48 |
| 49 bool GetWebNotificationTrayVisibility() { |
| 50 return ash::StatusAreaWidgetTestHelper::GetStatusAreaWidget() |
| 51 ->web_notification_tray() |
| 52 ->visible(); |
| 53 } |
| 54 |
| 55 } // anonymous namespace |
| 56 |
| 44 class SupervisedUserCreationTest : public SupervisedUserTestBase { | 57 class SupervisedUserCreationTest : public SupervisedUserTestBase { |
| 45 public: | 58 public: |
| 46 SupervisedUserCreationTest() : SupervisedUserTestBase() {} | 59 SupervisedUserCreationTest() : SupervisedUserTestBase() {} |
| 47 | 60 |
| 48 private: | 61 private: |
| 49 DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationTest); | 62 DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationTest); |
| 50 }; | 63 }; |
| 51 | 64 |
| 52 class SupervisedUserTransactionCleanupTest : public SupervisedUserTestBase { | 65 class SupervisedUserTransactionCleanupTest : public SupervisedUserTestBase { |
| 53 public: | 66 public: |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 | 190 |
| 178 std::string user_id = registration_utility_stub_->supervised_user_id(); | 191 std::string user_id = registration_utility_stub_->supervised_user_id(); |
| 179 | 192 |
| 180 // Make sure user is already in list. | 193 // Make sure user is already in list. |
| 181 ASSERT_EQ(3UL, user_manager::UserManager::Get()->GetUsers().size()); | 194 ASSERT_EQ(3UL, user_manager::UserManager::Get()->GetUsers().size()); |
| 182 | 195 |
| 183 // We wait for token now. Press cancel button at this point. | 196 // We wait for token now. Press cancel button at this point. |
| 184 JSEvalOrExitBrowser("$('supervised-user-creation').cancel()"); | 197 JSEvalOrExitBrowser("$('supervised-user-creation').cancel()"); |
| 185 } | 198 } |
| 186 | 199 |
| 200 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, |
| 201 PRE_PRE_PRE_CheckNoNotificationTray) { |
| 202 PrepareUsers(); |
| 203 } |
| 204 |
| 205 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, |
| 206 PRE_PRE_CheckNoNotificationTray) { |
| 207 // Before sign-in, the tray should not be visible. |
| 208 EXPECT_FALSE(GetWebNotificationTrayVisibility()); |
| 209 |
| 210 StartFlowLoginAsManager(); |
| 211 |
| 212 // On supervised user creation flow, the tray should not be visible. |
| 213 EXPECT_FALSE(GetWebNotificationTrayVisibility()); |
| 214 |
| 215 FillNewUserData(kTestSupervisedUserDisplayName); |
| 216 StartUserCreation("supervised-user-creation-next-button", |
| 217 kTestSupervisedUserDisplayName); |
| 218 } |
| 219 |
| 220 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, |
| 221 PRE_CheckNoNotificationTray) { |
| 222 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); |
| 223 |
| 224 // After sign-in, the tray should be visible. |
| 225 EXPECT_TRUE(GetWebNotificationTrayVisibility()); |
| 226 } |
| 227 |
| 228 IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, CheckNoNotificationTray) { |
| 229 RemoveSupervisedUser(3, 0, kTestSupervisedUserDisplayName); |
| 230 } |
| 231 |
| 187 IN_PROC_BROWSER_TEST_( | 232 IN_PROC_BROWSER_TEST_( |
| 188 SupervisedUserTransactionCleanupTest, | 233 SupervisedUserTransactionCleanupTest, |
| 189 CreateAndCancelSupervisedUser, | 234 CreateAndCancelSupervisedUser, |
| 190 SupervisedUserTransactionCleanupTest2, | 235 SupervisedUserTransactionCleanupTest2, |
| 191 testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) { | 236 testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) { |
| 192 // Make sure there is no supervised user in list. | 237 // Make sure there is no supervised user in list. |
| 193 ASSERT_EQ(2UL, user_manager::UserManager::Get()->GetUsers().size()); | 238 ASSERT_EQ(2UL, user_manager::UserManager::Get()->GetUsers().size()); |
| 194 } | 239 } |
| 195 | 240 |
| 196 } // namespace chromeos | 241 } // namespace chromeos |
| OLD | NEW |