Skip to content

Commit 199d3d9

Browse files
parndtparndt
committed
update refinery
1 parent bf142f1 commit 199d3d9

File tree

351 files changed

+603
-171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

351 files changed

+603
-171
lines changed

‎.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ index/**/*
3636
# NetBeans
3737
nbproject
3838

39+
# Eclipse
40+
.project
41+
3942
# Redcar
4043
.redcar
4144
tags
@@ -61,4 +64,4 @@ capybara-*html
6164
config/database.yml
6265
config/amazon_s3.yml
6366
config/rackspace_cloudfiles.yml
64-
#===END OF REMOVED DURING REFINERY GEM INSTALL===
67+
#===END OF REMOVED DURING REFINERY GEM INSTALL===

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ end
4545

4646
#===REQUIRED FOR REFINERY GEM INSTALL===
4747
# Leave the gem below disabled (commented out) if you're not using the gem install method.
48-
gem 'refinerycms', '= 0.9.7.8'
48+
gem 'refinerycms', '= 0.9.7.10'
4949
#===END OF REFINERY GEM INSTALL REQUIREMENTS===
5050

5151
# Bundle gems for certain environments:

‎Gemfile.lock

+120-120
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,111 @@
11
---
2-
hash: 766470d4bf066255dfd614614c720e5057f1e568
3-
sources:
4-
- Git:
5-
require: json/pure
6-
git: git://github.com/parndt/json.git
7-
branch: master
8-
uri: git://github.com/parndt/json.git
9-
ref: 34ad345d48764f3acf87a032b3efb4b1908b7213
10-
- Rubygems:
11-
uri: http://gemcutter.org
2+
dependencies:
3+
spork:
4+
group:
5+
- :test
6+
version: ">= 0"
7+
test-unit:
8+
group:
9+
- :test
10+
version: = 1.2.3
11+
rails:
12+
group:
13+
- :default
14+
version: = 2.3.8
15+
sqlite3-ruby:
16+
group:
17+
- :default
18+
version: ">= 0"
19+
require:
20+
- sqlite3
21+
authlogic:
22+
group:
23+
- :default
24+
version: = 2.1.5
25+
require:
26+
- authlogic
27+
ruby-prof:
28+
group:
29+
- :test
30+
version: ">= 0"
31+
refinerycms:
32+
group:
33+
- :default
34+
version: = 0.9.7.10
35+
rspec:
36+
group:
37+
- :test
38+
version: ">= 0"
39+
acts_as_indexed:
40+
group:
41+
- :default
42+
version: = 0.6.3
43+
require:
44+
- acts_as_indexed
45+
truncate_html:
46+
group:
47+
- :default
48+
version: = 0.3.2
49+
require:
50+
- truncate_html
51+
database_cleaner:
52+
group:
53+
- :test
54+
version: ">= 0"
55+
rspec-rails:
56+
group:
57+
- :test
58+
version: ">= 0"
59+
gherkin:
60+
group:
61+
- :test
62+
version: ">= 0"
63+
cucumber-rails:
64+
group:
65+
- :test
66+
version: ">= 0"
67+
factory_girl:
68+
group:
69+
- :test
70+
version: ">= 0"
71+
will_paginate:
72+
group:
73+
- :default
74+
version: = 2.3.14
75+
require:
76+
- will_paginate
77+
friendly_id:
78+
group:
79+
- :default
80+
version: = 3.0.6
81+
require:
82+
- friendly_id
83+
rmagick:
84+
group:
85+
- :default
86+
version: ~> 2.12.0
87+
albino:
88+
group:
89+
- :default
90+
version: ">= 0"
91+
json_pure:
92+
group:
93+
- :test
94+
version: ">= 0"
95+
require:
96+
- json/pure
97+
cucumber:
98+
group:
99+
- :test
100+
version: ">= 0"
101+
capybara:
102+
group:
103+
- :test
104+
version: ">= 0"
105+
launchy:
106+
group:
107+
- :test
108+
version: ">= 0"
12109
specs:
13110
- rake:
14111
version: 0.8.7
@@ -37,7 +134,7 @@ specs:
37134
- mime-types:
38135
version: "1.16"
39136
- nokogiri:
40-
version: 1.4.2
137+
version: 1.4.3.1
41138
- rack-test:
42139
version: 0.5.4
43140
- ffi:
@@ -68,7 +165,7 @@ specs:
68165
- database_cleaner:
69166
version: 0.5.2
70167
- factory_girl:
71-
version: 1.3.1
168+
version: 1.3.2
72169
- friendly_id:
73170
version: 3.0.6
74171
- rubyforge:
@@ -80,7 +177,7 @@ specs:
80177
- rails:
81178
version: 2.3.8
82179
- refinerycms:
83-
version: 0.9.7.8
180+
version: 0.9.7.10
84181
- rmagick:
85182
version: 2.12.2
86183
- rspec:
@@ -99,110 +196,13 @@ specs:
99196
version: 0.3.2
100197
- will_paginate:
101198
version: 2.3.14
102-
dependencies:
103-
sqlite3-ruby:
104-
version: ">= 0"
105-
group:
106-
- :default
107-
require:
108-
- sqlite3
109-
acts_as_indexed:
110-
version: = 0.6.3
111-
group:
112-
- :default
113-
require:
114-
- acts_as_indexed
115-
authlogic:
116-
version: = 2.1.5
117-
group:
118-
- :default
119-
require:
120-
- authlogic
121-
friendly_id:
122-
version: = 3.0.6
123-
group:
124-
- :default
125-
require:
126-
- friendly_id
127-
rails:
128-
version: = 2.3.8
129-
group:
130-
- :default
131-
rmagick:
132-
version: ~> 2.12.0
133-
group:
134-
- :default
135-
truncate_html:
136-
version: = 0.3.2
137-
group:
138-
- :default
139-
require:
140-
- truncate_html
141-
will_paginate:
142-
version: = 2.3.14
143-
group:
144-
- :default
145-
require:
146-
- will_paginate
147-
json_pure:
148-
version: ">= 0"
149-
group:
150-
- :test
151-
require:
152-
- json/pure
153-
factory_girl:
154-
version: ">= 0"
155-
group:
156-
- :test
157-
test-unit:
158-
version: = 1.2.3
159-
group:
160-
- :test
161-
capybara:
162-
version: ">= 0"
163-
group:
164-
- :test
165-
database_cleaner:
166-
version: ">= 0"
167-
group:
168-
- :test
169-
cucumber-rails:
170-
version: ">= 0"
171-
group:
172-
- :test
173-
cucumber:
174-
version: ">= 0"
175-
group:
176-
- :test
177-
rspec:
178-
version: ">= 0"
179-
group:
180-
- :test
181-
rspec-rails:
182-
version: ">= 0"
183-
group:
184-
- :test
185-
spork:
186-
version: ">= 0"
187-
group:
188-
- :test
189-
launchy:
190-
version: ">= 0"
191-
group:
192-
- :test
193-
gherkin:
194-
version: ">= 0"
195-
group:
196-
- :test
197-
ruby-prof:
198-
version: ">= 0"
199-
group:
200-
- :test
201-
refinerycms:
202-
version: = 0.9.7.8
203-
group:
204-
- :default
205-
albino:
206-
version: ">= 0"
207-
group:
208-
- :default
199+
hash: 09eb3960ff28a9152f3d5e10d6b57f5ec47c2465
200+
sources:
201+
- Git:
202+
uri: git://github.com/parndt/json.git
203+
branch: master
204+
git: git://github.com/parndt/json.git
205+
require: json/pure
206+
ref: 34ad345d48764f3acf87a032b3efb4b1908b7213
207+
- Rubygems:
208+
uri: http://gemcutter.org

‎db/migrate/20100729221735_remove_page_translations_if_present.rb

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
class RemovePageTranslationsIfPresent < ActiveRecord::Migration
2+
def self.up
3+
begin
4+
drop_table :page_translations
5+
rescue
6+
puts "-- page_translations did not exist, all is well."
7+
end
8+
end
9+
10+
def self.down
11+
end
12+
end

‎features/refinery/create_inquiries.feature

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
@inquiries @inquiries-create
2+
Feature: Create Inquiries
3+
In order to contact the website owner
4+
I want to create an inquiry
5+
6+
Background:
7+
Given A Refinery user exists
8+
And I have no inquiries
9+
And I have a page titled "Contact Us" with a custom url "/contact"
10+
And I have a page titled "Thank You" with a custom url "/contact/thank_you"
11+
12+
Scenario: Contact page
13+
When I go to the contact page
14+
Then I should see "Name *"
15+
And I should see "Email *"
16+
And I should see "Phone"
17+
And I should see "Message *"
18+
19+
Scenario: Create a valid inquiry
20+
When I go to the contact page
21+
And I fill in "Name *" with "Philip"
22+
And I fill in "Email *" with "[email protected]"
23+
And I fill in "Message *" with "It sure is good to have a functional test coverage."
24+
And I press "Send"
25+
Then I should be on the contact thank you page
26+
And I should see "Thank You"
27+
And I should see "received your inquiry"
28+
And I should see "Return to the home page"
29+
And I should have 1 inquiries
30+
31+
Scenario: Create an invalid inquiry
32+
When I go to the contact page
33+
And I press "Send"
34+
Then I should be on the contact create page
35+
And I should see "Name can't be blank"
36+
And I should not see "Email can't be blank"
37+
And I should see "Email is invalid"
38+
And I should not see "Phone can't be blank"
39+
And I should see "Message can't be blank"
40+
And I should have 0 inquiries

‎features/refinery/dashboard.feature

+35-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,38 @@
1+
@dashboard
12
Feature: Dashboard
23
In order to see recent changes to my website
34
As an administrator
4-
I want to use the dashboard
5+
I want to use the dashboard
6+
7+
Background:
8+
Given I am a logged in refinery user
9+
10+
Scenario: Translation options available
11+
When I go to the Dashboard
12+
Then I should see "English Change Language"
13+
14+
Scenario: Change Language to Slovenian and back to English
15+
When I go to the dashboard
16+
And I follow "English Change Language"
17+
And I follow "Slovenian"
18+
Then I should be on the dashboard
19+
And I should see "Slovenian Spremeni Jezik"
20+
And I should not see "Switch to your website"
21+
# Back to English
22+
When I follow "Slovenian Spremeni Jezik"
23+
And I follow "English"
24+
Then I should be on the dashboard
25+
And I should see "Switch to your website"
26+
And I should not see "Spremeni Jezik"
27+
28+
Scenario: Upload an Image Button
29+
30+
Scenario: Add New Page Button
31+
When I go to the dashboard
32+
And I follow "Add a new page"
33+
Then I should be on the new page form
34+
When I fill in "Title" with "Page test from Dashboard"
35+
And I press "Save"
36+
Then I should be on the dashboard
37+
And I should see "'Page test from Dashboard' was successfully created."
38+
And I should see "Page test from dashboard page was created"

0 commit comments

Comments
 (0)