diff --git a/spec/features/1_basic_spec.rb b/spec/features/1_basic_spec.rb
new file mode 100644
index 0000000..8a313a0
--- /dev/null
+++ b/spec/features/1_basic_spec.rb
@@ -0,0 +1,87 @@
+require "rails_helper"
+
+describe "The /movies page" do
+  it "can be visited", points: 1 do
+    visit "/movies"
+
+    expect(page.status_code).to be(200),
+      "Expected to visit /movies successfully."
+  end
+
+  it "has a link to add a movie", points: 1 do
+    visit "/movies"
+
+    expect(page).to have_link('Add a new movie', href: "/movies/new"),
+      "Expected /movies to have an 'Add a new movie' link to '/movies/new'."
+  end
+end
+
+describe "The /movies/new page" do
+  it "can be visited", points: 1 do
+    visit "/movies/new"
+
+    expect(page.status_code).to be(200),
+      "Expected to visit /movies/new successfully."
+  end
+
+  it "has a form", points: 1 do
+    visit "/movies/new"
+
+    expect(page).to have_selector("form[action='/movies']"),
+      "Expected /movies/new to have a form with action='/movies'."
+  end
+
+  it "creates a movie successfully", point: 1 do
+    visit "/movies/new"
+
+    fill_in "Title", with: "My test movie"
+    fill_in "Description", with: "description"
+    click_button "Create Movie"
+
+    expect(page).to have_content("Movie created successfully."),
+      "Expected to fill in the new movie form, click 'Create Movie', and be redirected to the movie index with a success notice"
+  end
+end
+
+describe "The movie details page" do
+  let(:movie) { Movie.create(title: "My title", description: "My description") }
+
+  it "can be visited", points: 1 do
+    visit "/movies/#{movie.id}"
+
+    expect(page.status_code).to be(200),
+      "Expected to visit /movies/ID successfully."
+  end
+
+  it "has a link to delete the movie with a DELETE request", points: 2 do
+    visit "/movies/#{movie.id}"
+
+    expect(page).to have_selector("a[href='/movies/#{movie.id}'][data-method='delete']", text: 'Delete Movie'),
+      "Expected /movies/ID to have 'Delete Movie' link with the proper data-method='delete'."
+  end
+end
+
+describe "The movie edit page" do
+  let(:movie) { Movie.create(title: "My title", description: "My description") }
+
+  it "can be visited", points: 1 do
+    visit "/movies/#{movie.id}/edit"
+
+    expect(page.status_code).to be(200),
+      "Expected to visit /movies/ID/edit successfully."
+  end
+
+  it "has a form", points: 1 do
+    visit "/movies/#{movie.id}/edit"
+
+    expect(page).to have_selector("form[action='/movies/#{movie.id}'][method='post']"),
+      "Expected /movies/ID/edit to have a form with action='/movies/ID' and method='post'."
+  end
+
+  it "has a hidden patch input", points: 2 do
+    visit "/movies/#{movie.id}/edit"
+
+    expect(page).to have_selector("input[name='_method'][value='patch']", visible: false),
+      "Expected the edit movie form to have an input field of type='hidden' with name='_method' and value='patch'."
+  end
+end
diff --git a/spec/features/dummy_spec.rb b/spec/features/dummy_spec.rb
deleted file mode 100644
index a2c737b..0000000
--- a/spec/features/dummy_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "rails_helper"
-
-describe "This project" do
-  it "has no tests" do
-    expect(1).to eq(1)
-  end
-end