saucy 0.2.14 → 0.2.15

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

@@ -2,6 +2,8 @@
   <h2>Billing Information</h2>
 <% end -%>
 
+<%= render :partial => 'accounts/tab_bar' %>
+
 <%= semantic_form_for @account, :url => account_billing_path(@account) do |form| %>
   <%= render :partial => 'billings/form', :locals => { :form => form } %>
 

data/app/views/billings/show.html.erb

@@ -1,6 +1,11 @@
 <% if current_user.admin_of?(current_account) -%>
+  <% content_for :header do -%>
+    <h2>Billing Information</h2>
+  <% end -%>
+
+  <%= render :partial => 'accounts/tab_bar' %>
+
   <div class="current_credit_card">
-    <h3>Billing Information</h3>
     <p>We're currently charging the credit card ending in <%= current_account.credit_card.last_4 %>. <%= link_to "Change", edit_account_billing_path(current_account) %></p>
   </div>
   <div class="billing_history">

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

@@ -79,3 +79,17 @@ Feature: Manage Billing
     Then I should see "Your Invoices"
     And I should see "07/01/10 $20"
     And I should see "08/01/10 $5"
+
+  Scenario: Navigate back to the main settings page
+    Given a paid plan exists with a name of "Paid"
+    And the following account exists:
+      | name | keyword | plan       | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
+      | Test | test    | name: Paid | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
+    And I have signed in with "joe@example.com/test"
+    And "joe@example.com" is an admin of the "Test" account
+    When I go to the billing page for the "Test" account
+    And I follow "Change"
+    And I follow "Billing"
+    And I follow "Account Info"
+    Then I should see "Settings for Test"
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 2
-  - 14
-  version: 0.2.14
+  - 15
+  version: 0.2.15
 platform: ruby
 authors: 
 - thoughtbot, inc.