saucy 0.2.38 → 0.2.39
Sign up to get free protection for your applications and to get access to all the features.
- data/app/views/accounts/_account.html.erb +2 -2
- data/app/views/accounts/edit.html.erb +2 -1
- data/app/views/accounts/index.html.erb +5 -1
- data/app/views/accounts/new.html.erb +1 -1
- data/app/views/profiles/edit.html.erb +1 -1
- data/lib/generators/saucy/features/templates/features/trial_plans.feature +1 -1
- data/spec/views/accounts/_account.html.erb_spec.rb +6 -13
- metadata +11 -11
@@ -5,8 +5,9 @@
|
|
5
5
|
<%= render :partial => 'tab_bar' %>
|
6
6
|
|
7
7
|
<div class="plan current">
|
8
|
-
<h3>Your Plan
|
8
|
+
<h3>Your Plan</h3>
|
9
9
|
<%= render @account.plan %>
|
10
|
+
<%= link_to "Upgrade", edit_account_plan_path(current_account), :id => "upgrade-account" %>
|
10
11
|
</div>
|
11
12
|
|
12
13
|
<%= content_tag_for :div, @account do -%>
|
@@ -29,7 +29,7 @@
|
|
29
29
|
<%= render :partial => 'billings/form', :locals => { :form => form } %>
|
30
30
|
<% end -%>
|
31
31
|
|
32
|
-
<p>By clicking <strong>Sign up</strong> you agree to our <%= link_to "Terms of Service", "/pages/terms" %>.</p>
|
32
|
+
<p id="terms-text">By clicking <strong>Sign up</strong> you agree to our <%= link_to "Terms of Service", "/pages/terms" %>.</p>
|
33
33
|
|
34
34
|
<%= form.buttons do %>
|
35
35
|
<%= form.commit_button "Sign up" %>
|
@@ -70,5 +70,5 @@ Feature: Trial plans
|
|
70
70
|
And "admin@example.com" is an admin of the "Test" account
|
71
71
|
And the "Test" account was created 7 days ago
|
72
72
|
When the daily Saucy jobs are processed
|
73
|
-
Then an email with subject "A check in
|
73
|
+
Then an email with subject "A check in" should be sent to "admin@example.com"
|
74
74
|
|
@@ -8,19 +8,14 @@ describe "/accounts/_account.html.erb" do
|
|
8
8
|
before { view.stubs(:current_user => user) }
|
9
9
|
|
10
10
|
def render_account
|
11
|
-
render :partial => "accounts/account",
|
11
|
+
render :partial => "accounts/account",
|
12
|
+
:locals => { :account => account, :projects => projects }
|
12
13
|
end
|
13
14
|
|
14
15
|
context "with projects" do
|
15
16
|
let(:project) { Factory.stub(:project, :name => 'Test Project') }
|
16
|
-
|
17
|
-
|
18
|
-
render_account
|
19
|
-
end
|
20
|
-
|
21
|
-
it "finds visible projects" do
|
22
|
-
account.should have_received(:projects_visible_to).with(user)
|
23
|
-
end
|
17
|
+
let(:projects) { [project] }
|
18
|
+
before { render_account }
|
24
19
|
|
25
20
|
it "renders projects" do
|
26
21
|
rendered.should include(project.name)
|
@@ -32,10 +27,8 @@ describe "/accounts/_account.html.erb" do
|
|
32
27
|
end
|
33
28
|
|
34
29
|
context "without projects" do
|
35
|
-
|
36
|
-
|
37
|
-
render_account
|
38
|
-
end
|
30
|
+
let(:projects) { [] }
|
31
|
+
before { render_account }
|
39
32
|
|
40
33
|
it "renders the blank slate" do
|
41
34
|
rendered.should include("blank_slate")
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: saucy
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 89
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 2
|
9
|
-
-
|
10
|
-
version: 0.2.
|
9
|
+
- 39
|
10
|
+
version: 0.2.39
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- thoughtbot, inc.
|
@@ -18,7 +18,7 @@ autorequire:
|
|
18
18
|
bindir: bin
|
19
19
|
cert_chain: []
|
20
20
|
|
21
|
-
date: 2011-03-
|
21
|
+
date: 2011-03-10 00:00:00 -05:00
|
22
22
|
default_executable:
|
23
23
|
dependencies:
|
24
24
|
- !ruby/object:Gem::Dependency
|
@@ -33,8 +33,8 @@ dependencies:
|
|
33
33
|
- 1
|
34
34
|
- 2
|
35
35
|
version: "1.2"
|
36
|
-
name: formtastic
|
37
36
|
version_requirements: *id001
|
37
|
+
name: formtastic
|
38
38
|
prerelease: false
|
39
39
|
- !ruby/object:Gem::Dependency
|
40
40
|
type: :runtime
|
@@ -49,8 +49,8 @@ dependencies:
|
|
49
49
|
- 0
|
50
50
|
- 3
|
51
51
|
version: 3.0.3
|
52
|
-
name: railties
|
53
52
|
version_requirements: *id002
|
53
|
+
name: railties
|
54
54
|
prerelease: false
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
type: :runtime
|
@@ -65,8 +65,8 @@ dependencies:
|
|
65
65
|
- 6
|
66
66
|
- 2
|
67
67
|
version: 2.6.2
|
68
|
-
name: braintree
|
69
68
|
version_requirements: *id003
|
69
|
+
name: braintree
|
70
70
|
prerelease: false
|
71
71
|
- !ruby/object:Gem::Dependency
|
72
72
|
type: :runtime
|
@@ -81,8 +81,8 @@ dependencies:
|
|
81
81
|
- 3
|
82
82
|
- 3
|
83
83
|
version: 1.3.3
|
84
|
-
name: sham_rack
|
85
84
|
version_requirements: *id004
|
85
|
+
name: sham_rack
|
86
86
|
prerelease: false
|
87
87
|
- !ruby/object:Gem::Dependency
|
88
88
|
type: :runtime
|
@@ -97,8 +97,8 @@ dependencies:
|
|
97
97
|
- 1
|
98
98
|
- 2
|
99
99
|
version: 1.1.2
|
100
|
-
name: sinatra
|
101
100
|
version_requirements: *id005
|
101
|
+
name: sinatra
|
102
102
|
prerelease: false
|
103
103
|
- !ruby/object:Gem::Dependency
|
104
104
|
type: :development
|
@@ -113,8 +113,8 @@ dependencies:
|
|
113
113
|
- 2
|
114
114
|
- 6
|
115
115
|
version: 0.2.6
|
116
|
-
name: aruba
|
117
116
|
version_requirements: *id006
|
117
|
+
name: aruba
|
118
118
|
prerelease: false
|
119
119
|
description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
|
120
120
|
email: support@thoughtbot.com
|
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
290
290
|
requirements: []
|
291
291
|
|
292
292
|
rubyforge_project:
|
293
|
-
rubygems_version: 1.
|
293
|
+
rubygems_version: 1.6.1
|
294
294
|
signing_key:
|
295
295
|
specification_version: 3
|
296
296
|
summary: Clearance-based Rails engine for SaaS
|