saucy 0.7.1 → 0.7.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.7.2
+
+Don't bother to show the account selection on the project form if the user is only an
+admin on one account
+
 0.7.1
 
 Introduce a project dropdown, include it with:

data/app/views/projects/_form.html.erb

@@ -1,5 +1,9 @@
 <%= form.inputs do %>
-  <%= form.input :account, :collection => current_user.memberships.admin.collect(&:account) %>
+  <% if current_user.memberships.admin.size > 1 -%>
+    <%= form.input :account, :collection => current_user.memberships.admin.collect(&:account) %>
+  <% else %>
+    <%= form.input :account, :as => :hidden, :value => current_account.id %>
+  <% end -%>
   <%= form.input :name, :hint => project_url(form.object).html_safe %>
   <%= form.input :keyword, :wrapper_html => { :style => 'display: none' } %>
   <% if form.object.persisted? -%>

data/lib/generators/saucy/features/templates/features/manage_projects.feature

@@ -12,13 +12,13 @@ Feature: Manage Projects
       | name     | email           |
       | Joe User | joe@example.com |
     And "joe@example.com" is an admin of the "Test" account
-    And "joe@example.com" is an admin of the "Another" account
     And I sign in as "joe@example.com"
 
-  Scenario: Create new project
+  Scenario: Create new project with one account
     When I go to the projects page for the "Test" account
     And I follow "New Project"
-    Then the "Joe User" checkbox should be checked
+    Then the page should not include "select#project_account_id"
+    And the "Joe User" checkbox should be checked
     When I fill in "Name" with "Project 1"
     And I fill in "Keyword" with "project1"
     And I should see "http://www.example.com/accounts/test/projects/keyword"
@@ -26,6 +26,12 @@ Feature: Manage Projects
     And I go to the projects page for the "Test" account
     Then I should see "Project 1" within "ul.projects"
 
+  Scenario: Creating new project with two accounts shows the account selection
+    Given "joe@example.com" is an admin of the "Another" account
+    When I go to the projects page for the "Test" account
+    And I follow "New Project"
+    Then the page should include "select#project_account_id"
+
   Scenario: Edit a project
     Given the following project exists:
       | account    | name      |
@@ -38,7 +44,8 @@ Feature: Manage Projects
 
   @javascript
   Scenario: Move a project
-    Given the following projects exist:
+    Given "joe@example.com" is an admin of the "Another" account
+    And the following projects exist:
       | account    | name      |
       | name: Test | Project 1 |
     When I go to the projects page for the "Test" account
@@ -50,7 +57,8 @@ Feature: Manage Projects
 
   @javascript
   Scenario: Move a project when account being moved to is at the account limit
-    Given the following limit exists for the "Another" account:
+    Given "joe@example.com" is an admin of the "Another" account
+    And the following limit exists for the "Another" account:
       | name     | value |
       | projects | 1     |
     And the following projects exist:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 -04:00
+date: 2011-05-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency