Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Changed some of the page text to matching 'contact' name instead of '…

…mailer'
  • Loading branch information...
commit ca80a7f19fd88e7b9c7e2d59be8c2d3d64934ca9 1 parent 8cc90e4
@mikel authored
View
8 app/views/home/index.html.erb
@@ -1,4 +1,4 @@
-<h1>Welcome to Mailer</h1>
+<h1>Welcome to Contact</h1>
<h2>Email Templates</h2>
@@ -12,7 +12,7 @@
</li>
<li>
- <%= link_to "New Message", new_message_path %>
+ <%= link_to "Mailouts", messages_path %>
</li>
<li>
@@ -21,9 +21,9 @@
<li>
<%- if current_user.admin -%>
- <%= link_to "Edit Users", users_path %><br />
+ <%= link_to "Users", users_path %><br />
<%- else -%>
- <%= link_to "Edit Profile", edit_user_path(current_user) %><br />
+ <%= link_to "Profile", edit_user_path(current_user) %><br />
<%- end -%>
</li>
View
4 app/views/messages/index.html.erb
@@ -1,9 +1,9 @@
<%- if @messages.empty? -%>
- No messages created
+ No mailouts created
<% else -%>
<ul>
<%= render :partial => 'message', :collection => @messages %>
</ul>
<%- end -%>
-<%= link_to "Make a new message", new_message_path %>
+<%= link_to "Make a new mailout", new_message_path %>
View
8 features/home_page.feature
@@ -7,12 +7,12 @@ Feature: Home page
Given I am logged in
When I go to the homepage
Then I should be on the homepage
- And I should see "Welcome to Mailer"
- And I should see "Edit Profile"
+ And I should see "Welcome to Contact"
+ And I should see "Profile"
Scenario: going to the home page as an administrator
Given I am logged in as an admin
When I go to the homepage
Then I should be on the homepage
- And I should see "Welcome to Mailer"
- And I should see "Edit Users"
+ And I should see "Welcome to Contact"
+ And I should see "Users"
View
55 features/manage_messages.feature
@@ -1,16 +1,18 @@
-Feature: Messages Wizard
+Feature: Managing Messages
In order to create a message to send
As a user
I want to be able to create a message using a step by step wizard
Scenario: Going to make a new message
Given I am logged in
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
Then I should be on the new message page
Scenario: Trying to make an email without a title
Given I am logged in
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I choose "Plain Text Only"
And I press "Next"
Then I should see "Title can't be blank"
@@ -18,7 +20,8 @@ Feature: Messages Wizard
Scenario: Making a new plain text email message directly
Given I am logged in
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My email"
And I choose "Plain Text Only"
And I press "Next"
@@ -27,13 +30,15 @@ Feature: Messages Wizard
Scenario: Making a new email message from a template without a template defined
Given I am logged in
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
Then I should not see "From Template"
Scenario: Making a new email message from a template
Given I am logged in
And there is an email template I made in the system with title "Hello There"
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My email"
And I choose "message_source_template"
And I press "Next"
@@ -42,7 +47,8 @@ Feature: Messages Wizard
Scenario: Making a new email message from a template and editing it
Given I am logged in
And there is an email template I made in the system with title "Hello There"
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My email"
And I choose "message_source_template"
And I press "Next"
@@ -57,7 +63,8 @@ Feature: Messages Wizard
Given I am logged in
And there is an email template I made in the system with title "Hello There"
And the email template entitled "Hello There" has an image attached called "rails.png"
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My email"
And I choose "message_source_template"
And I press "Next"
@@ -70,7 +77,8 @@ Feature: Messages Wizard
Scenario: Making a new email message from an uploaded file
Given I am logged in
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My email"
And I choose "message_source_upload"
And I press "Next"
@@ -80,7 +88,8 @@ Feature: Messages Wizard
Scenario: Making a new email message from an uploaded file and editing it
Given I am logged in
And there is a file called "simple_email/index.html"
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My email"
And I choose "message_source_upload"
And I press "Next"
@@ -95,7 +104,8 @@ Feature: Messages Wizard
Scenario: Making a new email message from an uploaded file with images and editing it
Given I am logged in
And there is a file called "simple_email/index.html"
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My email"
And I choose "message_source_upload"
And I press "Next"
@@ -109,7 +119,8 @@ Feature: Messages Wizard
Scenario: Saving a created message
Given I am logged in
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My new email"
And I choose "Plain Text Only"
And I press "Next"
@@ -121,7 +132,8 @@ Feature: Messages Wizard
Given I am logged in
And there is a group in the system called "Public"
And there is a recipient I added in the system called "Mikel Lindsaar"
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My new email"
And I choose "Plain Text Only"
And I press "Next"
@@ -137,7 +149,8 @@ Feature: Messages Wizard
Scenario: Selecting a recipient for a message should not show a validation error
Given I am logged in
And there is a recipient I added in the system called "Mikel Lindsaar"
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My new email"
And I choose "Plain Text Only"
And I press "Next"
@@ -150,7 +163,8 @@ Feature: Messages Wizard
Scenario: Selecting a group for a message should not show a validation error
Given I am logged in
And there is a group in the system called "Public"
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My new email"
And I choose "Plain Text Only"
And I press "Next"
@@ -164,7 +178,8 @@ Feature: Messages Wizard
Given I am logged in
And there is a group in the system called "Public"
And there is a recipient I added in the system called "Mikel Lindsaar"
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My new email"
And I choose "Plain Text Only"
And I press "Next"
@@ -180,7 +195,8 @@ Feature: Messages Wizard
Scenario: Trying to add the same group twice
Given I am logged in
And there is a group in the system called "Public"
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My new email"
And I choose "Plain Text Only"
And I press "Next"
@@ -204,7 +220,8 @@ Feature: Messages Wizard
Scenario: Saving a created message
Given I am logged in
And there is a group in the system called "Public"
- When I follow "New Message"
+ When I follow "Mailouts"
+ And I follow "Make a new mailout"
And I fill in "Title" with "My new email"
And I choose "Plain Text Only"
And I press "Next"
@@ -275,4 +292,4 @@ Feature: Messages Wizard
And there is a message called "My Email" in the system with "Public" as a group that has been scheduled
When I go to the edit page for "Message" with a "title" of "My Email"
And I press "Confirm Mailout"
- Then I should be on the messages page
+ Then I should be on the messages page
View
3  features/manage_recipients.feature
@@ -106,6 +106,3 @@ Feature: Manage Recipients
Then I should be on the edit page for "Recipient" with a "given_name" of "Mikel"
And I should not see "Remove"
And I should see "Public"
-
-
-
View
4 lib/tasks/bootstrap.rake
@@ -2,8 +2,8 @@
desc 'Bootstraps the system'
task :bootstrap => :environment do
org = Organization.create!(:name => "Default")
- user = User.new(:password => 'mailer',
- :password_confirmation => 'mailer',
+ user = User.new(:password => 'contact',
+ :password_confirmation => 'contact',
:given_name => 'Default',
:family_name => 'Admin',
:email => 'admin@nowaythisisadomainname.org.au')
Please sign in to comment.
Something went wrong with that request. Please try again.