Merge pull request #492 from coreos-inc/nofreelunch

UI and API fixes for disallowing private repo count abuse

test/test_api_usage.py

@@ -317,8 +317,18 @@ class TestGetUserPrivateAllowed(ApiTestCase):
 
   def test_allowed(self):
     self.login(ADMIN_ACCESS_USER)
+
+    # Change the subscription of the namespace.
+    self.putJsonResponse(UserPlan, data=dict(plan='personal-30'))
+
     json = self.getJsonResponse(PrivateRepositories)
     assert json['privateCount'] >= 6
+    assert not json['privateAllowed']
+
+    # Change the subscription of the namespace.
+    self.putJsonResponse(UserPlan, data=dict(plan='bus-large-30'))
+
+    json = self.getJsonResponse(PrivateRepositories)
     assert json['privateAllowed']
 
 
@@ -1437,6 +1447,36 @@ class TestUpdateRepo(ApiTestCase):
 
 class TestChangeRepoVisibility(ApiTestCase):
   SIMPLE_REPO = ADMIN_ACCESS_USER + '/simple'
+
+  def test_trychangevisibility(self):
+    self.login(ADMIN_ACCESS_USER)
+
+    # Make public.
+    self.postJsonResponse(RepositoryVisibility,
+                          params=dict(repository=self.SIMPLE_REPO),
+                          data=dict(visibility='public'))
+
+    # Verify the visibility.
+    json = self.getJsonResponse(Repository,
+                                params=dict(repository=self.SIMPLE_REPO))
+
+    self.assertEquals(True, json['is_public'])
+
+    # Change the subscription of the namespace.
+    self.putJsonResponse(UserPlan, data=dict(plan='personal-30'))
+
+    # Try to make private.
+    self.postJsonResponse(RepositoryVisibility,
+                          params=dict(repository=self.SIMPLE_REPO),
+                          data=dict(visibility='private'),
+                          expected_code=402)
+
+    # Verify the visibility.
+    json = self.getJsonResponse(Repository,
+                                params=dict(repository=self.SIMPLE_REPO))
+
+    self.assertEquals(True, json['is_public'])
+
   def test_changevisibility(self):
     self.login(ADMIN_ACCESS_USER)
 

test/testconfig.py

@@ -20,6 +20,7 @@ TEST_DB_FILE = NamedTemporaryFile(delete=True)
 class TestConfig(DefaultConfig):
   TESTING = True
   SECRET_KEY = 'a36c9d7d-25a9-4d3f-a586-3d2f8dc40a83'
+  BILLING_TYPE = 'FakeStripe'
 
   TEST_DB_FILE = TEST_DB_FILE
   DB_URI = os.environ.get('TEST_DATABASE_URI', 'sqlite:///{0}'.format(TEST_DB_FILE.name))