saucy 0.4.3 → 0.4.4

data/app/views/plans/_plan.html.erb

@@ -20,10 +20,12 @@
       <% end %>
     <% end %>
     <% plan.limits.boolean.each do |limit| %>
-      <% if limit.allowed? -%>
-        <%= content_tag_for :li, limit, :class => limit.name do %>
+      <%= content_tag_for :li, limit, :class => limit.name do %>
+        <% if limit.allowed? -%>
           <%= limit.name %>
-        <% end %>
+        <% else %>
+          &nbsp;
+        <% end -%>
       <% end -%>
     <% end %>
   <% end -%>

data/app/views/plans/edit.html.erb

@@ -6,7 +6,10 @@
   <%= form.inputs :class => "radio optional" do %>
     <% @plans.each do |plan| -%>
       <%= content_tag_for :li, plan, :class => "#{plan.name.parameterize} #{'disabled' if !@account.can_change_plan_to?(plan)}" do %>
-        <%= form.label :plan_id, render(plan), :value => plan.id %>
+        <div>
+          <%= render(plan) %>
+        </div>
+        <%= form.label :plan_id, "Choose plan", :value => plan.id %>
         <%= form.radio_button :plan_id, plan.id, :disabled => !@account.can_change_plan_to?(plan), "data-free" => plan.free? %>
         <% if !@account.can_change_plan_to?(plan) -%>
           <p class="disabled"><%= t(".plan-disabled", :default => "Too big for %{name}.", :name => plan.name) %></p>

data/lib/generators/saucy/features/templates/step_definitions/plan_steps.rb

@@ -1,10 +1,10 @@
 When /^I choose the "([^"]*)" plan$/ do |plan_name|
-  input_id = find(:xpath, "//label/p[contains(text(),'#{plan_name}')]/..")["for"]
+  input_id = find(:xpath, "//li[contains(@class, 'plan')]//p[contains(text(), '#{plan_name}')]/../../input")["id"]
   choose(input_id)
 end
 
 Then /^the "([^"]*)" plan should be disabled$/ do |plan_name|
-  input_id = find(:xpath, "//label/p[contains(text(),'#{plan_name}')]/..")["for"]
+  input_id = find(:xpath, "//li[contains(@class, 'plan')]//p[contains(text(), '#{plan_name}')]/../../input")["id"]
   page.should have_css("##{input_id}[disabled='disabled']")
 end
 

data/lib/generators/saucy/features/templates/step_definitions/user_steps.rb

@@ -1,16 +1,21 @@
 Given /^"([^"]*)" is a member of the "([^"]*)" project$/ do |email, project_name|
   user = User.find_by_email!(email)
   project = Project.find_by_name!(project_name)
-  membership = Factory(:membership, :user => user, :account => project.account)
+  membership = Membership.find_by_user_id_and_account_id(user, project.account) ||
+               Factory(:membership, :user => user, :account => project.account)
   Factory(:permission, :membership => membership, :project => project)
 end
 
 Given /^"([^"]*)" is an admin of the "([^"]*)" project$/ do |email, project_name|
   user = User.find_by_email!(email)
   project = Project.find_by_name!(project_name)
-  membership = Factory(:membership, :user    => user,
-                                    :account => project.account,
-                                    :admin   => true)
+  if membership = Membership.find_by_user_id_and_account_id(user, project.account)
+    membership.update_attribute(:admin, true)
+  else
+    membership = Factory(:membership, :user    => user,
+                                      :account => project.account,
+                                      :admin   => true)
+  end
   Factory(:permission, :membership => membership, :project => project)
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,13 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -04:00
+date: 2011-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: formtastic
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,12 +33,12 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: railties
+  requirement: *id001
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: formtastic
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,12 +49,12 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: braintree
+  requirement: *id002
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: railties
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,12 +65,12 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sham_rack
+  requirement: *id003
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: braintree
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -82,12 +81,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sinatra
+  requirement: *id004
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: sham_rack
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -98,12 +97,12 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: aruba
+  requirement: *id005
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: sinatra
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -114,8 +113,9 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  type: :development
-  version_requirements: *id006
+  requirement: *id006
+  prerelease: false
+  name: aruba
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []
@@ -296,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS